[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r15817 - gnunet/src/nat
From: |
gnunet |
Subject: |
[GNUnet-SVN] r15817 - gnunet/src/nat |
Date: |
Fri, 1 Jul 2011 19:59:57 +0200 |
Author: grothoff
Date: 2011-07-01 19:59:57 +0200 (Fri, 01 Jul 2011)
New Revision: 15817
Modified:
gnunet/src/nat/nat_test.c
Log:
more nat code
Modified: gnunet/src/nat/nat_test.c
===================================================================
--- gnunet/src/nat/nat_test.c 2011-07-01 16:02:42 UTC (rev 15816)
+++ gnunet/src/nat/nat_test.c 2011-07-01 17:59:57 UTC (rev 15817)
@@ -169,16 +169,30 @@
{
struct NatActivity *na = cls;
struct GNUNET_NAT_Test *tst;
+ uint16_t data;
na->rtask = GNUNET_SCHEDULER_NO_TASK;
tst = na->h;
GNUNET_CONTAINER_DLL_remove (tst->head,
tst->tail,
na);
- if (1)
+ if ( (NULL != tc->write_ready) &&
+ (GNUNET_NETWORK_fdset_isset (tc->read_ready,
+ na->sock)) &&
+ (sizeof (data) ==
+ GNUNET_NETWORK_socket_recv (na->sock,
+ &data,
+ sizeof (data))) )
{
- // fimxe: read from socket...
+ if (data == tst->data)
+ tst->report (tst->report_cls, GNUNET_OK);
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received data mismatches expected value\n");
}
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Failed to receive data from inbound connection\n");
GNUNET_NETWORK_socket_close (na->sock);
GNUNET_free (na);
}
@@ -208,7 +222,12 @@
tst);
s = GNUNET_NETWORK_socket_accept (tst->lsock, NULL, NULL);
if (NULL == s)
- return; /* odd error */
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_INFO, "accept");
+ return; /* odd error */
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Got an inbound connection, waiting for data\n");
wl = GNUNET_malloc (sizeof (struct NatActivity));
wl->sock = s;
wl->h = tst;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r15817 - gnunet/src/nat,
gnunet <=