diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:54:06 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:54:06 +0000 |
commit | 5746309cb4be2073d550ad7a6885e918631dbc38 (patch) | |
tree | 89455bc4aadf977816b38df13f990372cd81d71a /src/transport/test_transport_api_multiaddress.c | |
parent | 6fd3e715cae09fa6e657c96f1c6f9711ee51f42f (diff) | |
download | gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.tar.gz gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.zip |
indentation
Diffstat (limited to 'src/transport/test_transport_api_multiaddress.c')
-rw-r--r-- | src/transport/test_transport_api_multiaddress.c | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/src/transport/test_transport_api_multiaddress.c b/src/transport/test_transport_api_multiaddress.c index 63ef28862..8748e5f6c 100644 --- a/src/transport/test_transport_api_multiaddress.c +++ b/src/transport/test_transport_api_multiaddress.c | |||
@@ -165,13 +165,12 @@ end_normally (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
165 | } | 165 | } |
166 | 166 | ||
167 | static void | 167 | static void |
168 | notify_connect (void *cls, | 168 | notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer, |
169 | const struct GNUNET_PeerIdentity *peer, | ||
170 | const struct GNUNET_TRANSPORT_ATS_Information *ats, | 169 | const struct GNUNET_TRANSPORT_ATS_Information *ats, |
171 | uint32_t ats_count) | 170 | uint32_t ats_count) |
172 | { | 171 | { |
173 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 172 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%4s' connected to us (%p)!\n", |
174 | "Peer `%4s' connected to us (%p)!\n", GNUNET_i2s (peer), cls); | 173 | GNUNET_i2s (peer), cls); |
175 | if (cls == &p1) | 174 | if (cls == &p1) |
176 | { | 175 | { |
177 | GNUNET_assert (ok >= 2); | 176 | GNUNET_assert (ok >= 2); |
@@ -182,8 +181,8 @@ notify_connect (void *cls, | |||
182 | if (GNUNET_SCHEDULER_NO_TASK != tct) | 181 | if (GNUNET_SCHEDULER_NO_TASK != tct) |
183 | GNUNET_SCHEDULER_cancel (tct); | 182 | GNUNET_SCHEDULER_cancel (tct); |
184 | tct = GNUNET_SCHEDULER_NO_TASK; | 183 | tct = GNUNET_SCHEDULER_NO_TASK; |
185 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT_TRANSMIT, | 184 | die_task = |
186 | &end_normally, NULL); | 185 | GNUNET_SCHEDULER_add_delayed (TIMEOUT_TRANSMIT, &end_normally, NULL); |
187 | } | 186 | } |
188 | } | 187 | } |
189 | 188 | ||
@@ -196,8 +195,8 @@ notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) | |||
196 | GNUNET_SCHEDULER_cancel (die_task); | 195 | GNUNET_SCHEDULER_cancel (die_task); |
197 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 196 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); |
198 | } | 197 | } |
199 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 198 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%4s' disconnected (%p)!\n", |
200 | "Peer `%4s' disconnected (%p)!\n", GNUNET_i2s (peer), cls); | 199 | GNUNET_i2s (peer), cls); |
201 | } | 200 | } |
202 | 201 | ||
203 | 202 | ||
@@ -210,24 +209,24 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
210 | if (GNUNET_CONFIGURATION_have_value (p->cfg, "PATHS", "SERVICEHOME")) | 209 | if (GNUNET_CONFIGURATION_have_value (p->cfg, "PATHS", "SERVICEHOME")) |
211 | { | 210 | { |
212 | GNUNET_assert (GNUNET_OK == | 211 | GNUNET_assert (GNUNET_OK == |
213 | GNUNET_CONFIGURATION_get_value_string (p->cfg, | 212 | GNUNET_CONFIGURATION_get_value_string (p->cfg, "PATHS", |
214 | "PATHS", | ||
215 | "SERVICEHOME", | 213 | "SERVICEHOME", |
216 | &p->servicehome)); | 214 | &p->servicehome)); |
217 | GNUNET_DISK_directory_remove (p->servicehome); | 215 | GNUNET_DISK_directory_remove (p->servicehome); |
218 | } | 216 | } |
219 | 217 | ||
220 | #if START_ARM | 218 | #if START_ARM |
221 | p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", | 219 | p->arm_proc = |
222 | "gnunet-service-arm", | 220 | GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", |
221 | "gnunet-service-arm", | ||
223 | #if VERBOSE_ARM | 222 | #if VERBOSE_ARM |
224 | "-L", "DEBUG", | 223 | "-L", "DEBUG", |
225 | #endif | 224 | #endif |
226 | "-c", cfgname, NULL); | 225 | "-c", cfgname, NULL); |
227 | #endif | 226 | #endif |
228 | p->th = GNUNET_TRANSPORT_connect (p->cfg, | 227 | p->th = |
229 | NULL, p, | 228 | GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, ¬ify_connect, |
230 | NULL, ¬ify_connect, ¬ify_disconnect); | 229 | ¬ify_disconnect); |
231 | GNUNET_assert (p->th != NULL); | 230 | GNUNET_assert (p->th != NULL); |
232 | } | 231 | } |
233 | 232 | ||
@@ -239,15 +238,15 @@ try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
239 | /* FIXME: 'pX.id' may still be all-zeros here... */ | 238 | /* FIXME: 'pX.id' may still be all-zeros here... */ |
240 | GNUNET_TRANSPORT_try_connect (p2.th, &p1.id); | 239 | GNUNET_TRANSPORT_try_connect (p2.th, &p1.id); |
241 | GNUNET_TRANSPORT_try_connect (p1.th, &p2.id); | 240 | GNUNET_TRANSPORT_try_connect (p1.th, &p2.id); |
242 | tct = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, | 241 | tct = |
243 | &try_connect, NULL); | 242 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &try_connect, |
243 | NULL); | ||
244 | } | 244 | } |
245 | 245 | ||
246 | 246 | ||
247 | static void | 247 | static void |
248 | run (void *cls, | 248 | run (void *cls, char *const *args, const char *cfgfile, |
249 | char *const *args, | 249 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
250 | const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) | ||
251 | { | 250 | { |
252 | GNUNET_assert (ok == 1); | 251 | GNUNET_assert (ok == 1); |
253 | OKPP; | 252 | OKPP; |
@@ -284,8 +283,8 @@ check () | |||
284 | setTransportOptions ("test_transport_api_data.conf"); | 283 | setTransportOptions ("test_transport_api_data.conf"); |
285 | #endif | 284 | #endif |
286 | ok = 1; | 285 | ok = 1; |
287 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, | 286 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, |
288 | argv, "test-transport-api", "nohelp", options, &run, &ok); | 287 | "test-transport-api", "nohelp", options, &run, &ok); |
289 | stop_arm (&p1); | 288 | stop_arm (&p1); |
290 | stop_arm (&p2); | 289 | stop_arm (&p2); |
291 | 290 | ||