diff options
| author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-11-01 11:44:44 +0000 |
|---|---|---|
| committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-11-01 11:44:44 +0000 |
| commit | c28bd04f017edfcae59f8d18698090c9e60e3699 (patch) | |
| tree | 77e87d8ef65e34ddf0a864c2fe94244d0fd50035 /src | |
| parent | 45ecb8fc02474aaadbc6a417c477d9ba0780b5c7 (diff) | |
| download | gnunet-c28bd04f017edfcae59f8d18698090c9e60e3699.tar.gz gnunet-c28bd04f017edfcae59f8d18698090c9e60e3699.zip | |
fix for port-conflicts while starting multiple controllers on same host
Diffstat (limited to 'src')
| -rw-r--r-- | src/testbed/gnunet-service-testbed.c | 2 | ||||
| -rw-r--r-- | src/testbed/test_testbed_api.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c index 24626d702..d39bd82ad 100644 --- a/src/testbed/gnunet-service-testbed.c +++ b/src/testbed/gnunet-service-testbed.c | |||
| @@ -1806,7 +1806,7 @@ handle_init (void *cls, struct GNUNET_SERVER_Client *client, | |||
| 1806 | master_context->client = client; | 1806 | master_context->client = client; |
| 1807 | master_context->host_id = ntohl (msg->host_id); | 1807 | master_context->host_id = ntohl (msg->host_id); |
| 1808 | master_context->master_ip = GNUNET_strdup (controller_hostname); | 1808 | master_context->master_ip = GNUNET_strdup (controller_hostname); |
| 1809 | LOG_DEBUG ("Master Controller IP: %s\n", master_context->master_ip); | 1809 | LOG_DEBUG ("Our IP: %s\n", master_context->master_ip); |
| 1810 | master_context->system = | 1810 | master_context->system = |
| 1811 | GNUNET_TESTING_system_create ("testbed", master_context->master_ip, hostname); | 1811 | GNUNET_TESTING_system_create ("testbed", master_context->master_ip, hostname); |
| 1812 | host = | 1812 | host = |
diff --git a/src/testbed/test_testbed_api.conf b/src/testbed/test_testbed_api.conf index dfdfdb93b..c094edee7 100644 --- a/src/testbed/test_testbed_api.conf +++ b/src/testbed/test_testbed_api.conf | |||
| @@ -43,7 +43,7 @@ PORT = 12092 | |||
| 43 | AUTOSTART = YES | 43 | AUTOSTART = YES |
| 44 | 44 | ||
| 45 | [arm] | 45 | [arm] |
| 46 | DEFAULTSERVICES = core | 46 | DEFAULTSERVICES = core transport |
| 47 | PORT = 12366 | 47 | PORT = 12366 |
| 48 | DEBUG = NO | 48 | DEBUG = NO |
| 49 | 49 | ||