diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-12-03 17:31:48 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-12-03 17:31:48 +0000 |
commit | 3497cf2a8e182972cf217e38f9c762f7df4cec2f (patch) | |
tree | e663f19307964d9417d5dcf987176c3c858ef2a3 /src/testbed/testbed_api.c | |
parent | ac1843fcf0e0bda117d02c6ffbf976a11f379a35 (diff) | |
download | gnunet-3497cf2a8e182972cf217e38f9c762f7df4cec2f.tar.gz gnunet-3497cf2a8e182972cf217e38f9c762f7df4cec2f.zip |
- remove duplicate functions
Diffstat (limited to 'src/testbed/testbed_api.c')
-rw-r--r-- | src/testbed/testbed_api.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index e171f21a7..a1be406cf 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c | |||
@@ -1169,7 +1169,7 @@ helper_mst (void *cls, void *client, const struct GNUNET_MessageHeader *message) | |||
1169 | (cp->cfg, config, config_size, GNUNET_NO)); | 1169 | (cp->cfg, config, config_size, GNUNET_NO)); |
1170 | GNUNET_free (config); | 1170 | GNUNET_free (config); |
1171 | if ((NULL == cp->host) || | 1171 | if ((NULL == cp->host) || |
1172 | (NULL == (hostname = GNUNET_TESTBED_host_get_hostname_ (cp->host)))) | 1172 | (NULL == (hostname = GNUNET_TESTBED_host_get_hostname (cp->host)))) |
1173 | hostname = "localhost"; | 1173 | hostname = "localhost"; |
1174 | /* Change the hostname so that we can connect to it */ | 1174 | /* Change the hostname so that we can connect to it */ |
1175 | GNUNET_CONFIGURATION_set_value_string (cp->cfg, "testbed", "hostname", | 1175 | GNUNET_CONFIGURATION_set_value_string (cp->cfg, "testbed", "hostname", |
@@ -1409,7 +1409,7 @@ GNUNET_TESTBED_controller_start (const char *controller_ip, | |||
1409 | unsigned int argp; | 1409 | unsigned int argp; |
1410 | 1410 | ||
1411 | username = GNUNET_TESTBED_host_get_username_ (host); | 1411 | username = GNUNET_TESTBED_host_get_username_ (host); |
1412 | hostname = GNUNET_TESTBED_host_get_hostname_ (host); | 1412 | hostname = GNUNET_TESTBED_host_get_hostname (host); |
1413 | GNUNET_asprintf (&port, "%u", GNUNET_TESTBED_host_get_ssh_port_ (host)); | 1413 | GNUNET_asprintf (&port, "%u", GNUNET_TESTBED_host_get_ssh_port_ (host)); |
1414 | if (NULL == username) | 1414 | if (NULL == username) |
1415 | GNUNET_asprintf (&dst, "%s", hostname); | 1415 | GNUNET_asprintf (&dst, "%s", hostname); |
@@ -1590,7 +1590,7 @@ GNUNET_TESTBED_controller_connect (const struct GNUNET_CONFIGURATION_Handle | |||
1590 | GNUNET_TESTBED_operation_queue_create_ | 1590 | GNUNET_TESTBED_operation_queue_create_ |
1591 | (controller->num_parallel_connects); | 1591 | (controller->num_parallel_connects); |
1592 | controller->num_parallel_connects_threshold = num_parallel_connects_threshold; | 1592 | controller->num_parallel_connects_threshold = num_parallel_connects_threshold; |
1593 | controller_hostname = GNUNET_TESTBED_host_get_hostname_ (host); | 1593 | controller_hostname = GNUNET_TESTBED_host_get_hostname (host); |
1594 | if (NULL == controller_hostname) | 1594 | if (NULL == controller_hostname) |
1595 | controller_hostname = "127.0.0.1"; | 1595 | controller_hostname = "127.0.0.1"; |
1596 | msg = | 1596 | msg = |
@@ -1713,7 +1713,7 @@ GNUNET_TESTBED_register_host (struct GNUNET_TESTBED_Controller *controller, | |||
1713 | 1713 | ||
1714 | if (NULL != controller->rh) | 1714 | if (NULL != controller->rh) |
1715 | return NULL; | 1715 | return NULL; |
1716 | hostname = GNUNET_TESTBED_host_get_hostname_ (host); | 1716 | hostname = GNUNET_TESTBED_host_get_hostname (host); |
1717 | if (GNUNET_YES == GNUNET_TESTBED_is_host_registered_ (host, controller)) | 1717 | if (GNUNET_YES == GNUNET_TESTBED_is_host_registered_ (host, controller)) |
1718 | { | 1718 | { |
1719 | LOG (GNUNET_ERROR_TYPE_WARNING, "Host hostname: %s already registered\n", | 1719 | LOG (GNUNET_ERROR_TYPE_WARNING, "Host hostname: %s already registered\n", |