diff options
Diffstat (limited to 'src/nat/nat_test.c')
-rw-r--r-- | src/nat/nat_test.c | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/src/nat/nat_test.c b/src/nat/nat_test.c index 4b502ec60..dc8255a8e 100644 --- a/src/nat/nat_test.c +++ b/src/nat/nat_test.c | |||
@@ -169,16 +169,30 @@ do_read (void *cls, | |||
169 | { | 169 | { |
170 | struct NatActivity *na = cls; | 170 | struct NatActivity *na = cls; |
171 | struct GNUNET_NAT_Test *tst; | 171 | struct GNUNET_NAT_Test *tst; |
172 | uint16_t data; | ||
172 | 173 | ||
173 | na->rtask = GNUNET_SCHEDULER_NO_TASK; | 174 | na->rtask = GNUNET_SCHEDULER_NO_TASK; |
174 | tst = na->h; | 175 | tst = na->h; |
175 | GNUNET_CONTAINER_DLL_remove (tst->head, | 176 | GNUNET_CONTAINER_DLL_remove (tst->head, |
176 | tst->tail, | 177 | tst->tail, |
177 | na); | 178 | na); |
178 | if (1) | 179 | if ( (NULL != tc->write_ready) && |
180 | (GNUNET_NETWORK_fdset_isset (tc->read_ready, | ||
181 | na->sock)) && | ||
182 | (sizeof (data) == | ||
183 | GNUNET_NETWORK_socket_recv (na->sock, | ||
184 | &data, | ||
185 | sizeof (data))) ) | ||
179 | { | 186 | { |
180 | // fimxe: read from socket... | 187 | if (data == tst->data) |
188 | tst->report (tst->report_cls, GNUNET_OK); | ||
189 | else | ||
190 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
191 | "Received data mismatches expected value\n"); | ||
181 | } | 192 | } |
193 | else | ||
194 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
195 | "Failed to receive data from inbound connection\n"); | ||
182 | GNUNET_NETWORK_socket_close (na->sock); | 196 | GNUNET_NETWORK_socket_close (na->sock); |
183 | GNUNET_free (na); | 197 | GNUNET_free (na); |
184 | } | 198 | } |
@@ -208,7 +222,12 @@ do_accept (void *cls, | |||
208 | tst); | 222 | tst); |
209 | s = GNUNET_NETWORK_socket_accept (tst->lsock, NULL, NULL); | 223 | s = GNUNET_NETWORK_socket_accept (tst->lsock, NULL, NULL); |
210 | if (NULL == s) | 224 | if (NULL == s) |
211 | return; /* odd error */ | 225 | { |
226 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_INFO, "accept"); | ||
227 | return; /* odd error */ | ||
228 | } | ||
229 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
230 | "Got an inbound connection, waiting for data\n"); | ||
212 | wl = GNUNET_malloc (sizeof (struct NatActivity)); | 231 | wl = GNUNET_malloc (sizeof (struct NatActivity)); |
213 | wl->sock = s; | 232 | wl->sock = s; |
214 | wl->h = tst; | 233 | wl->h = tst; |