diff options
Diffstat (limited to 'src/testbed/test_testbed_underlay.c')
-rw-r--r-- | src/testbed/test_testbed_underlay.c | 108 |
1 files changed, 56 insertions, 52 deletions
diff --git a/src/testbed/test_testbed_underlay.c b/src/testbed/test_testbed_underlay.c index fad4282d7..e0434379b 100644 --- a/src/testbed/test_testbed_underlay.c +++ b/src/testbed/test_testbed_underlay.c | |||
@@ -49,10 +49,10 @@ static struct GNUNET_TESTBED_Operation *op; | |||
49 | * @param tc scheduler task context | 49 | * @param tc scheduler task context |
50 | */ | 50 | */ |
51 | static void | 51 | static void |
52 | do_shutdown(void *cls) | 52 | do_shutdown (void *cls) |
53 | { | 53 | { |
54 | if (NULL != op) | 54 | if (NULL != op) |
55 | GNUNET_TESTBED_operation_done(op); | 55 | GNUNET_TESTBED_operation_done (op); |
56 | op = NULL; | 56 | op = NULL; |
57 | } | 57 | } |
58 | 58 | ||
@@ -66,21 +66,23 @@ do_shutdown(void *cls) | |||
66 | * operation has executed successfully. | 66 | * operation has executed successfully. |
67 | */ | 67 | */ |
68 | static void | 68 | static void |
69 | overlay_connect_status(void *cls, | 69 | overlay_connect_status (void *cls, |
70 | struct GNUNET_TESTBED_Operation *op_, | 70 | struct GNUNET_TESTBED_Operation *op_, |
71 | const char *emsg) | 71 | const char *emsg) |
72 | { | 72 | { |
73 | GNUNET_assert(op_ == op); | 73 | GNUNET_assert (op_ == op); |
74 | GNUNET_TESTBED_operation_done(op); | 74 | GNUNET_TESTBED_operation_done (op); |
75 | op = NULL; | 75 | op = NULL; |
76 | if (NULL == emsg) | 76 | if (NULL == emsg) |
77 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Peers 0 and 2 should not get connected\n"); | 77 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
78 | "Peers 0 and 2 should not get connected\n"); | ||
78 | else | 79 | else |
79 | { | 80 | { |
80 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Peers 0 and 2 not connected: %s. Success!\n", emsg); | 81 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
81 | result = GNUNET_OK; | 82 | "Peers 0 and 2 not connected: %s. Success!\n", emsg); |
82 | } | 83 | result = GNUNET_OK; |
83 | GNUNET_SCHEDULER_shutdown(); | 84 | } |
85 | GNUNET_SCHEDULER_shutdown (); | ||
84 | } | 86 | } |
85 | 87 | ||
86 | 88 | ||
@@ -98,29 +100,30 @@ overlay_connect_status(void *cls, | |||
98 | * failed | 100 | * failed |
99 | */ | 101 | */ |
100 | static void | 102 | static void |
101 | test_master(void *cls, | 103 | test_master (void *cls, |
102 | struct GNUNET_TESTBED_RunHandle *h, | 104 | struct GNUNET_TESTBED_RunHandle *h, |
103 | unsigned int num_peers, | 105 | unsigned int num_peers, |
104 | struct GNUNET_TESTBED_Peer **peers_, | 106 | struct GNUNET_TESTBED_Peer **peers_, |
105 | unsigned int links_succeeded, | 107 | unsigned int links_succeeded, |
106 | unsigned int links_failed) | 108 | unsigned int links_failed) |
107 | { | 109 | { |
108 | GNUNET_assert(NULL == cls); | 110 | GNUNET_assert (NULL == cls); |
109 | if (NULL == peers_) | 111 | if (NULL == peers_) |
110 | { | 112 | { |
111 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failing test due to timeout\n"); | 113 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test due to timeout\n"); |
112 | GNUNET_SCHEDULER_shutdown(); | 114 | GNUNET_SCHEDULER_shutdown (); |
113 | return; | 115 | return; |
114 | } | 116 | } |
115 | GNUNET_assert(NUM_PEERS == num_peers); | 117 | GNUNET_assert (NUM_PEERS == num_peers); |
116 | op = GNUNET_TESTBED_overlay_connect(NULL, | 118 | op = GNUNET_TESTBED_overlay_connect (NULL, |
117 | &overlay_connect_status, | 119 | &overlay_connect_status, |
118 | NULL, | 120 | NULL, |
119 | peers_[0], | 121 | peers_[0], |
120 | peers_[2]); | 122 | peers_[2]); |
121 | GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, | 123 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply ( |
122 | 60), | 124 | GNUNET_TIME_UNIT_SECONDS, |
123 | &do_shutdown, NULL); | 125 | 60), |
126 | &do_shutdown, NULL); | ||
124 | } | 127 | } |
125 | 128 | ||
126 | 129 | ||
@@ -136,7 +139,7 @@ test_master(void *cls, | |||
136 | * Main function | 139 | * Main function |
137 | */ | 140 | */ |
138 | int | 141 | int |
139 | main(int argc, char **argv) | 142 | main (int argc, char **argv) |
140 | { | 143 | { |
141 | struct GNUNET_CONFIGURATION_Handle *cfg; | 144 | struct GNUNET_CONFIGURATION_Handle *cfg; |
142 | char pwd[PATH_MAX]; | 145 | char pwd[PATH_MAX]; |
@@ -145,26 +148,27 @@ main(int argc, char **argv) | |||
145 | 148 | ||
146 | result = GNUNET_SYSERR; | 149 | result = GNUNET_SYSERR; |
147 | event_mask = 0; | 150 | event_mask = 0; |
148 | cfg = GNUNET_CONFIGURATION_create(); | 151 | cfg = GNUNET_CONFIGURATION_create (); |
149 | GNUNET_assert(GNUNET_YES == | 152 | GNUNET_assert (GNUNET_YES == |
150 | GNUNET_CONFIGURATION_parse(cfg, | 153 | GNUNET_CONFIGURATION_parse (cfg, |
151 | "test_testbed_underlay.conf.in")); | 154 | "test_testbed_underlay.conf.in")); |
152 | if (NULL == getcwd(pwd, PATH_MAX)) | 155 | if (NULL == getcwd (pwd, PATH_MAX)) |
153 | return 1; | 156 | return 1; |
154 | GNUNET_assert(0 < GNUNET_asprintf(&dbfile, "%s/%s", pwd, | 157 | GNUNET_assert (0 < GNUNET_asprintf (&dbfile, "%s/%s", pwd, |
155 | "test-underlay.sqlite")); | 158 | "test-underlay.sqlite")); |
156 | GNUNET_CONFIGURATION_set_value_string(cfg, "TESTBED-UNDERLAY", "DBFILE", dbfile); | 159 | GNUNET_CONFIGURATION_set_value_string (cfg, "TESTBED-UNDERLAY", "DBFILE", |
157 | GNUNET_assert(GNUNET_OK == GNUNET_CONFIGURATION_write | 160 | dbfile); |
158 | (cfg, "test_testbed_underlay.conf")); | 161 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_write |
159 | GNUNET_CONFIGURATION_destroy(cfg); | 162 | (cfg, "test_testbed_underlay.conf")); |
163 | GNUNET_CONFIGURATION_destroy (cfg); | ||
160 | cfg = NULL; | 164 | cfg = NULL; |
161 | GNUNET_free(dbfile); | 165 | GNUNET_free (dbfile); |
162 | dbfile = NULL; | 166 | dbfile = NULL; |
163 | (void)GNUNET_TESTBED_test_run("test_testbed_underlay", | 167 | (void) GNUNET_TESTBED_test_run ("test_testbed_underlay", |
164 | "test_testbed_underlay.conf", NUM_PEERS, | 168 | "test_testbed_underlay.conf", NUM_PEERS, |
165 | event_mask, NULL, NULL, | 169 | event_mask, NULL, NULL, |
166 | &test_master, NULL); | 170 | &test_master, NULL); |
167 | (void)unlink("test_testbed_underlay.conf"); | 171 | (void) unlink ("test_testbed_underlay.conf"); |
168 | if (GNUNET_OK != result) | 172 | if (GNUNET_OK != result) |
169 | return 1; | 173 | return 1; |
170 | return 0; | 174 | return 0; |