diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-12-04 10:34:39 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-12-04 10:34:39 +0000 |
commit | a317854b14a85a34f43655b1f74433c07f7ebbf9 (patch) | |
tree | 8e95b677c208bbf544ff415ba675ba5c8f2d5e2f /src/testbed/testbed_api_testbed.c | |
parent | f6b3966b20fa4dbf737752f2959b78cdba03341d (diff) | |
download | gnunet-a317854b14a85a34f43655b1f74433c07f7ebbf9.tar.gz gnunet-a317854b14a85a34f43655b1f74433c07f7ebbf9.zip |
- use localhost without chcking when hosts file is NULL
Diffstat (limited to 'src/testbed/testbed_api_testbed.c')
-rw-r--r-- | src/testbed/testbed_api_testbed.c | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c index a87f1f058..3617f9a3d 100644 --- a/src/testbed/testbed_api_testbed.c +++ b/src/testbed/testbed_api_testbed.c | |||
@@ -941,11 +941,7 @@ GNUNET_TESTBED_run (const char *host_filename, | |||
941 | } | 941 | } |
942 | } | 942 | } |
943 | else | 943 | else |
944 | { | 944 | rc->h = GNUNET_TESTBED_host_create (NULL, NULL, 0); |
945 | rc->hosts = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Host *)); | ||
946 | rc->hosts[0] = GNUNET_TESTBED_host_create (NULL, NULL, 0); | ||
947 | rc->num_hosts = 1; | ||
948 | } | ||
949 | rc->cfg = GNUNET_CONFIGURATION_dup (cfg); | 945 | rc->cfg = GNUNET_CONFIGURATION_dup (cfg); |
950 | rc->num_peers = num_peers; | 946 | rc->num_peers = num_peers; |
951 | rc->event_mask = event_mask; | 947 | rc->event_mask = event_mask; |
@@ -1003,31 +999,38 @@ GNUNET_TESTBED_run (const char *host_filename, | |||
1003 | /* Do nothing */ | 999 | /* Do nothing */ |
1004 | break; | 1000 | break; |
1005 | } | 1001 | } |
1006 | rc->hc_handles = GNUNET_malloc (sizeof (struct | 1002 | if (NULL != host_filename) |
1007 | GNUNET_TESTBED_HostHabitableCheckHandle *) | 1003 | { |
1008 | * rc->num_hosts); | 1004 | rc->hc_handles = GNUNET_malloc (sizeof (struct |
1009 | for (nhost = 0; nhost < rc->num_hosts; nhost++) | 1005 | GNUNET_TESTBED_HostHabitableCheckHandle *) |
1010 | { | 1006 | * rc->num_hosts); |
1011 | if (NULL == (rc->hc_handles[nhost] = | 1007 | for (nhost = 0; nhost < rc->num_hosts; nhost++) |
1012 | GNUNET_TESTBED_is_host_habitable (rc->hosts[nhost], rc->cfg, | 1008 | { |
1013 | &host_habitable_cb, | 1009 | if (NULL == (rc->hc_handles[nhost] = |
1014 | rc))) | 1010 | GNUNET_TESTBED_is_host_habitable (rc->hosts[nhost], rc->cfg, |
1015 | { | 1011 | &host_habitable_cb, |
1016 | GNUNET_break (0); | 1012 | rc))) |
1017 | for (nhost = 0; nhost < rc->num_hosts; nhost++) | 1013 | { |
1018 | if (NULL != rc->hc_handles[nhost]) | 1014 | GNUNET_break (0); |
1019 | GNUNET_TESTBED_is_host_habitable_cancel (rc->hc_handles[nhost]); | 1015 | for (nhost = 0; nhost < rc->num_hosts; nhost++) |
1020 | GNUNET_free (rc->hc_handles); | 1016 | if (NULL != rc->hc_handles[nhost]) |
1021 | rc->hc_handles = NULL; | 1017 | GNUNET_TESTBED_is_host_habitable_cancel (rc->hc_handles[nhost]); |
1022 | goto error_cleanup; | 1018 | GNUNET_free (rc->hc_handles); |
1019 | rc->hc_handles = NULL; | ||
1020 | goto error_cleanup; | ||
1021 | } | ||
1023 | } | 1022 | } |
1024 | } | 1023 | } |
1024 | else | ||
1025 | rc->cproc = | ||
1026 | GNUNET_TESTBED_controller_start ("127.0.0.1", rc->h, rc->cfg, | ||
1027 | &controller_status_cb, rc); | ||
1025 | rc->shutdown_run_task = | 1028 | rc->shutdown_run_task = |
1026 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, | 1029 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, |
1027 | &shutdown_run, rc); | 1030 | &shutdown_run, rc); |
1028 | return; | 1031 | return; |
1029 | 1032 | ||
1030 | error_cleanup: | 1033 | error_cleanup: |
1031 | if (NULL != rc->h) | 1034 | if (NULL != rc->h) |
1032 | GNUNET_TESTBED_host_destroy (rc->h); | 1035 | GNUNET_TESTBED_host_destroy (rc->h); |
1033 | if (NULL != rc->hosts) | 1036 | if (NULL != rc->hosts) |