diff options
| author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-10-18 14:52:25 +0000 |
|---|---|---|
| committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-10-18 14:52:25 +0000 |
| commit | 846b6a5bee7dc3e42a8664f01890d59cefaedb8a (patch) | |
| tree | 2cef889ecab8e72185af18d8785ba8751b78a0db /src | |
| parent | 7360be56a1334394337d279676d1785ec69aa26f (diff) | |
| download | gnunet-846b6a5bee7dc3e42a8664f01890d59cefaedb8a.tar.gz gnunet-846b6a5bee7dc3e42a8664f01890d59cefaedb8a.zip | |
use controller's host when slave host is NULL
Diffstat (limited to 'src')
| -rw-r--r-- | src/testbed/testbed_api.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index e5722218a..ebb9496f2 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c | |||
| @@ -2054,8 +2054,9 @@ GNUNET_TESTBED_controller_link (void *op_cls, | |||
| 2054 | 2054 | ||
| 2055 | GNUNET_assert (GNUNET_YES == | 2055 | GNUNET_assert (GNUNET_YES == |
| 2056 | GNUNET_TESTBED_is_host_registered_ (delegated_host, master)); | 2056 | GNUNET_TESTBED_is_host_registered_ (delegated_host, master)); |
| 2057 | slave_host_id = (NULL == slave_host) ? | 2057 | slave_host_id = |
| 2058 | 0 : GNUNET_TESTBED_host_get_id_ (slave_host); | 2058 | GNUNET_TESTBED_host_get_id_ ((NULL != slave_host) |
| 2059 | ? slave_host : master->host); | ||
| 2059 | delegated_host_id = GNUNET_TESTBED_host_get_id_ (delegated_host); | 2060 | delegated_host_id = GNUNET_TESTBED_host_get_id_ (delegated_host); |
| 2060 | if ((NULL != slave_host) && (0 != slave_host_id)) | 2061 | if ((NULL != slave_host) && (0 != slave_host_id)) |
| 2061 | GNUNET_assert (GNUNET_YES == | 2062 | GNUNET_assert (GNUNET_YES == |