[GNUnet-SVN] r10891 - in gnunet: . src/core src/include src/peerinfo

[gnunet]

Author: grothoff
Date: 2010-04-12 22:38:21 +0200 (Mon, 12 Apr 2010)
New Revision: 10891

Modified:
   gnunet/TODO
   gnunet/src/core/gnunet-service-core.c
   gnunet/src/include/gnunet_signatures.h
   gnunet/src/peerinfo/peerinfo_api.c
Log:
stuff

Modified: gnunet/TODO
===================================================================
--- gnunet/TODO 2010-04-12 20:36:38 UTC (rev 10890)
+++ gnunet/TODO 2010-04-12 20:38:21 UTC (rev 10891)
@@ -1,6 +1,10 @@
 0.9.0pre0 [April]:
-* NAT: peer behind NAT fails to bootstrap: we never get a session key from the 
other peer
-       (but we DO get a PONG to our PING!) [CG]
+* TRANSPORT: inbound sessions are not properly PING-PONG validated,
+  connect-event is then not properly signalled (peer behind NAT
+  never gets a 'connect' message) and finally we DO transmit 
+  data messages over the invalidated, only half-connect-signalled
+  channel (which confuses the core state machine, or now causes
+  transport-api assertion failures). [CG]
 * FS-acceptance testing [CG]
 * Release checks:
   - portability

Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c       2010-04-12 20:36:38 UTC (rev 
10890)
+++ gnunet/src/core/gnunet-service-core.c       2010-04-12 20:38:21 UTC (rev 
10891)
@@ -2454,8 +2454,13 @@
 #endif
       return; /* already in progress */
     }
-  if (! n->is_connected)
+  if (GNUNET_YES != n->is_connected)
     {
+#if DEBUG_CORE
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Not yet connected to peer `%4s'!\n",
+                  GNUNET_i2s (&n->peer));
+#endif
       if (NULL == n->th)
        {
          GNUNET_STATISTICS_update (stats, 

Modified: gnunet/src/include/gnunet_signatures.h
===================================================================
--- gnunet/src/include/gnunet_signatures.h      2010-04-12 20:36:38 UTC (rev 
10890)
+++ gnunet/src/include/gnunet_signatures.h      2010-04-12 20:38:21 UTC (rev 
10891)
@@ -43,9 +43,9 @@
 #define GNUNET_SIGNATURE_PURPOSE_TEST 0
 
 /**
- * Signature for confirming HELLOs for TCP plugins.
+ * Signature for confirming HELLOs for transport.
  */
-#define GNUNET_SIGNATURE_PURPOSE_TRANSPORT_TCP_PING 1
+#define GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PING 1
 
 
 /**

Modified: gnunet/src/peerinfo/peerinfo_api.c
===================================================================
--- gnunet/src/peerinfo/peerinfo_api.c  2010-04-12 20:36:38 UTC (rev 10890)
+++ gnunet/src/peerinfo/peerinfo_api.c  2010-04-12 20:38:21 UTC (rev 10891)
@@ -216,15 +216,11 @@
     }
 #if DEBUG_PEERINFO
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Received information about peer `%s' from peerinfo database\n",
+             "Received %u bytes of `%s' information about peer `%s' from 
PEERINFO database\n",
+             (hello == NULL) ? 0 : (unsigned int) GNUNET_HELLO_size (hello),
+             "HELLO",
              GNUNET_i2s (&im->peer));
 #endif
-#if DEBUG_PEERINFO
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Size of `%s' is %u bytes\n",
-             "HELLO",
-             (hello == NULL) ? 0 : (unsigned int) GNUNET_HELLO_size (hello));
-#endif  
   ic->callback (ic->callback_cls, &im->peer, hello, ntohl (im->trust));
   GNUNET_CLIENT_receive (ic->client,
                          &info_handler,