diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-06-17 11:53:17 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-06-17 11:53:17 +0000 |
commit | 976473839da8f1978ea31015339858927d0bdbd2 (patch) | |
tree | 4892e35713222a1849c3442713d5cdaab04f4b36 /src/transport/test_transport_api.c | |
parent | ea8801774f9dcc2bbe7c7f61c4686d80b7e4d365 (diff) | |
download | gnunet-976473839da8f1978ea31015339858927d0bdbd2.tar.gz gnunet-976473839da8f1978ea31015339858927d0bdbd2.zip |
Diffstat (limited to 'src/transport/test_transport_api.c')
-rw-r--r-- | src/transport/test_transport_api.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c index ca9ceaef6..966f66fff 100644 --- a/src/transport/test_transport_api.c +++ b/src/transport/test_transport_api.c | |||
@@ -89,6 +89,8 @@ static char * cert_file_p1; | |||
89 | static char * key_file_p2; | 89 | static char * key_file_p2; |
90 | static char * cert_file_p2; | 90 | static char * cert_file_p2; |
91 | 91 | ||
92 | struct GNUNET_TRANSPORT_TransmitHandle * th; | ||
93 | |||
92 | #if VERBOSE | 94 | #if VERBOSE |
93 | #define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0) | 95 | #define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0) |
94 | #else | 96 | #else |
@@ -103,6 +105,10 @@ end () | |||
103 | GNUNET_SCHEDULER_cancel (die_task); | 105 | GNUNET_SCHEDULER_cancel (die_task); |
104 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 106 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
105 | "Disconnecting from transports!\n"); | 107 | "Disconnecting from transports!\n"); |
108 | if (th != NULL) | ||
109 | GNUNET_TRANSPORT_notify_transmit_ready_cancel(th); | ||
110 | th = NULL; | ||
111 | |||
106 | GNUNET_TRANSPORT_disconnect (p1.th); | 112 | GNUNET_TRANSPORT_disconnect (p1.th); |
107 | GNUNET_TRANSPORT_disconnect (p2.th); | 113 | GNUNET_TRANSPORT_disconnect (p2.th); |
108 | die_task = GNUNET_SCHEDULER_NO_TASK; | 114 | die_task = GNUNET_SCHEDULER_NO_TASK; |
@@ -130,6 +136,11 @@ end_badly () | |||
130 | { | 136 | { |
131 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n"); | 137 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n"); |
132 | GNUNET_break (0); | 138 | GNUNET_break (0); |
139 | |||
140 | if (th != NULL) | ||
141 | GNUNET_TRANSPORT_notify_transmit_ready_cancel(th); | ||
142 | th = NULL; | ||
143 | |||
133 | GNUNET_TRANSPORT_disconnect (p1.th); | 144 | GNUNET_TRANSPORT_disconnect (p1.th); |
134 | GNUNET_TRANSPORT_disconnect (p2.th); | 145 | GNUNET_TRANSPORT_disconnect (p2.th); |
135 | if (GNUNET_SCHEDULER_NO_TASK != tct) | 146 | if (GNUNET_SCHEDULER_NO_TASK != tct) |
@@ -167,6 +178,8 @@ notify_ready (void *cls, size_t size, void *buf) | |||
167 | struct PeerContext *p = cls; | 178 | struct PeerContext *p = cls; |
168 | struct GNUNET_MessageHeader *hdr; | 179 | struct GNUNET_MessageHeader *hdr; |
169 | 180 | ||
181 | th = NULL; | ||
182 | |||
170 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 183 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
171 | "Transmitting message with %u bytes to peer %s\n", | 184 | "Transmitting message with %u bytes to peer %s\n", |
172 | sizeof (struct GNUNET_MessageHeader), | 185 | sizeof (struct GNUNET_MessageHeader), |
@@ -244,7 +257,7 @@ notify_connect (void *cls, | |||
244 | GNUNET_TRANSPORT_get_hello_cancel (p1.th, &exchange_hello, &p1); | 257 | GNUNET_TRANSPORT_get_hello_cancel (p1.th, &exchange_hello, &p1); |
245 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT_TRANSMIT, | 258 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT_TRANSMIT, |
246 | &end_badly, NULL); | 259 | &end_badly, NULL); |
247 | GNUNET_TRANSPORT_notify_transmit_ready (p1.th, | 260 | th = GNUNET_TRANSPORT_notify_transmit_ready (p1.th, |
248 | &p2.id, | 261 | &p2.id, |
249 | 256, 0, TIMEOUT, ¬ify_ready, | 262 | 256, 0, TIMEOUT, ¬ify_ready, |
250 | &p1); | 263 | &p1); |