aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/testbed_api_hosts.c
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2013-05-17 08:04:15 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2013-05-17 08:04:15 +0000
commitc47979fd1c48558a4981ca853348d8b8d4c4197d (patch)
tree0d367426aad8ca31d8f2ad384c5c4a0e173577b3 /src/testbed/testbed_api_hosts.c
parenta4eea61eb191e8151ec0e2be01e4ec41b88ad062 (diff)
downloadgnunet-c47979fd1c48558a4981ca853348d8b8d4c4197d.tar.gz
gnunet-c47979fd1c48558a4981ca853348d8b8d4c4197d.zip
- revert 27109,27108
Diffstat (limited to 'src/testbed/testbed_api_hosts.c')
-rw-r--r--src/testbed/testbed_api_hosts.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index 4b9d12f80..40e9e5be4 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -1062,7 +1062,6 @@ helper_mst (void *cls, void *client, const struct GNUNET_MessageHeader *message)
1062 struct GNUNET_TESTBED_ControllerProc *cp = cls; 1062 struct GNUNET_TESTBED_ControllerProc *cp = cls;
1063 const struct GNUNET_TESTBED_HelperReply *msg; 1063 const struct GNUNET_TESTBED_HelperReply *msg;
1064 const char *hostname; 1064 const char *hostname;
1065 const char *hostip;
1066 char *config; 1065 char *config;
1067 uLongf config_size; 1066 uLongf config_size;
1068 uLongf xconfig_size; 1067 uLongf xconfig_size;
@@ -1090,12 +1089,9 @@ helper_mst (void *cls, void *client, const struct GNUNET_MessageHeader *message)
1090 if ((NULL == cp->host) || 1089 if ((NULL == cp->host) ||
1091 (NULL == (hostname = GNUNET_TESTBED_host_get_hostname (cp->host)))) 1090 (NULL == (hostname = GNUNET_TESTBED_host_get_hostname (cp->host))))
1092 hostname = "localhost"; 1091 hostname = "localhost";
1093 hostip = simple_resolve (hostname);
1094 if (NULL == hostip)
1095 hostip = "127.0.0.1";
1096 /* Change the hostname so that we can connect to it */ 1092 /* Change the hostname so that we can connect to it */
1097 GNUNET_CONFIGURATION_set_value_string (cp->host->cfg, "testbed", "hostname", 1093 GNUNET_CONFIGURATION_set_value_string (cp->host->cfg, "testbed", "hostname",
1098 hostip); 1094 hostname);
1099 cp->host->locked = GNUNET_NO; 1095 cp->host->locked = GNUNET_NO;
1100 cp->host->controller_started = GNUNET_YES; 1096 cp->host->controller_started = GNUNET_YES;
1101 cp->cb (cp->cls, cp->host->cfg, GNUNET_OK); 1097 cp->cb (cp->cls, cp->host->cfg, GNUNET_OK);