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/transport-testing.c | |
parent | 6fd3e715cae09fa6e657c96f1c6f9711ee51f42f (diff) | |
download | gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.tar.gz gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.zip |
indentation
Diffstat (limited to 'src/transport/transport-testing.c')
-rw-r--r-- | src/transport/transport-testing.c | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c index e6fcabb48..62544584c 100644 --- a/src/transport/transport-testing.c +++ b/src/transport/transport-testing.c | |||
@@ -41,14 +41,13 @@ struct ConnectingContext | |||
41 | int p2_c; | 41 | int p2_c; |
42 | }; | 42 | }; |
43 | 43 | ||
44 | static void | 44 | static void exchange_hello_last (void *cb_cls, |
45 | exchange_hello_last (void *cb_cls, const struct GNUNET_MessageHeader *message); | 45 | const struct GNUNET_MessageHeader *message); |
46 | static void | 46 | static void exchange_hello (void *cb_cls, |
47 | exchange_hello (void *cb_cls, const struct GNUNET_MessageHeader *message); | 47 | const struct GNUNET_MessageHeader *message); |
48 | 48 | ||
49 | static void | 49 | static void |
50 | notify_connect_internal (void *cls, | 50 | notify_connect_internal (void *cls, const struct GNUNET_PeerIdentity *peer, |
51 | const struct GNUNET_PeerIdentity *peer, | ||
52 | const struct GNUNET_TRANSPORT_ATS_Information *ats, | 51 | const struct GNUNET_TRANSPORT_ATS_Information *ats, |
53 | uint32_t ats_count) | 52 | uint32_t ats_count) |
54 | { | 53 | { |
@@ -93,8 +92,7 @@ notify_connect_internal (void *cls, | |||
93 | } | 92 | } |
94 | 93 | ||
95 | static void | 94 | static void |
96 | notify_connect (void *cls, | 95 | notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer, |
97 | const struct GNUNET_PeerIdentity *peer, | ||
98 | const struct GNUNET_TRANSPORT_ATS_Information *ats, | 96 | const struct GNUNET_TRANSPORT_ATS_Information *ats, |
99 | uint32_t ats_count) | 97 | uint32_t ats_count) |
100 | { | 98 | { |
@@ -118,8 +116,7 @@ notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) | |||
118 | } | 116 | } |
119 | 117 | ||
120 | static void | 118 | static void |
121 | notify_receive (void *cls, | 119 | notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, |
122 | const struct GNUNET_PeerIdentity *peer, | ||
123 | const struct GNUNET_MessageHeader *message, | 120 | const struct GNUNET_MessageHeader *message, |
124 | const struct GNUNET_TRANSPORT_ATS_Information *ats, | 121 | const struct GNUNET_TRANSPORT_ATS_Information *ats, |
125 | uint32_t ats_count) | 122 | uint32_t ats_count) |
@@ -188,8 +185,8 @@ try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
188 | GNUNET_TRANSPORT_try_connect (cc->th_p1, &p2->id); | 185 | GNUNET_TRANSPORT_try_connect (cc->th_p1, &p2->id); |
189 | GNUNET_TRANSPORT_try_connect (cc->th_p2, &p1->id); | 186 | GNUNET_TRANSPORT_try_connect (cc->th_p2, &p1->id); |
190 | 187 | ||
191 | cc->tct = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, | 188 | cc->tct = |
192 | &try_connect, cc); | 189 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &try_connect, cc); |
193 | } | 190 | } |
194 | 191 | ||
195 | 192 | ||
@@ -218,14 +215,15 @@ GNUNET_TRANSPORT_TESTING_start_peer (const char *cfgname, | |||
218 | &p->servicehome); | 215 | &p->servicehome); |
219 | if (NULL != p->servicehome) | 216 | if (NULL != p->servicehome) |
220 | GNUNET_DISK_directory_remove (p->servicehome); | 217 | GNUNET_DISK_directory_remove (p->servicehome); |
221 | p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", | 218 | p->arm_proc = |
222 | "gnunet-service-arm", "-c", cfgname, | 219 | GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", |
220 | "gnunet-service-arm", "-c", cfgname, | ||
223 | #if VERBOSE_PEERS | 221 | #if VERBOSE_PEERS |
224 | "-L", "DEBUG", | 222 | "-L", "DEBUG", |
225 | #else | 223 | #else |
226 | "-L", "ERROR", | 224 | "-L", "ERROR", |
227 | #endif | 225 | #endif |
228 | NULL); | 226 | NULL); |
229 | p->nc = nc; | 227 | p->nc = nc; |
230 | p->nd = nd; | 228 | p->nd = nd; |
231 | p->rec = rec; | 229 | p->rec = rec; |
@@ -234,10 +232,9 @@ GNUNET_TRANSPORT_TESTING_start_peer (const char *cfgname, | |||
234 | else | 232 | else |
235 | p->cb_cls = p; | 233 | p->cb_cls = p; |
236 | 234 | ||
237 | p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, | 235 | p->th = |
238 | p, | 236 | GNUNET_TRANSPORT_connect (p->cfg, NULL, p, ¬ify_receive, |
239 | ¬ify_receive, | 237 | ¬ify_connect, ¬ify_disconnect); |
240 | ¬ify_connect, ¬ify_disconnect); | ||
241 | GNUNET_assert (p->th != NULL); | 238 | GNUNET_assert (p->th != NULL); |
242 | return p; | 239 | return p; |
243 | } | 240 | } |
@@ -296,13 +293,13 @@ GNUNET_TRANSPORT_TESTING_connect_peers (struct PeerContext *p1, | |||
296 | cc->cb = cb; | 293 | cc->cb = cb; |
297 | cc->cb_cls = cb_cls; | 294 | cc->cb_cls = cb_cls; |
298 | 295 | ||
299 | cc->th_p1 = GNUNET_TRANSPORT_connect (cc->p1->cfg, NULL, | 296 | cc->th_p1 = |
300 | cc, | 297 | GNUNET_TRANSPORT_connect (cc->p1->cfg, NULL, cc, NULL, |
301 | NULL, ¬ify_connect_internal, NULL); | 298 | ¬ify_connect_internal, NULL); |
302 | 299 | ||
303 | cc->th_p2 = GNUNET_TRANSPORT_connect (cc->p2->cfg, NULL, | 300 | cc->th_p2 = |
304 | cc, | 301 | GNUNET_TRANSPORT_connect (cc->p2->cfg, NULL, cc, NULL, |
305 | NULL, ¬ify_connect_internal, NULL); | 302 | ¬ify_connect_internal, NULL); |
306 | 303 | ||
307 | GNUNET_assert (cc->th_p1 != NULL); | 304 | GNUNET_assert (cc->th_p1 != NULL); |
308 | GNUNET_assert (cc->th_p2 != NULL); | 305 | GNUNET_assert (cc->th_p2 != NULL); |