stuff

diff --git a/TODO b/TODO
index cd1212d2aa0a48511d238a7ef6596c9f43a1b0a8..0bc5c43f9d8caacacc54c4c834972c10daca85c3 100644 (file)
--- a/TODO
+++ b/TODO
@@ -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

diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index a9bc1328830747a374226042c8d159cf928bc735..044b7496ed717a2370ab67a014b371885fd9b314 100644 (file)
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -2454,8 +2454,13 @@ send_key (struct Neighbour *n)
 #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, 

diff --git a/src/include/gnunet_signatures.h b/src/include/gnunet_signatures.h
index 29da16b4253273c82b88ee83be522768b118f422..0dd795dd2eb7b1fcee9a8cb105d1e6e66176dd4d 100644 (file)
--- a/src/include/gnunet_signatures.h
+++ b/src/include/gnunet_signatures.h
@@ -43,9 +43,9 @@ extern "C"
 #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
 
 
 /**

diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c
index 2a7c990e4a604c67c174d5b2e22a16dc0be230e5..6fd538f0dc1a225e6abdee9ba6bb6758f267a85d 100644 (file)
--- a/src/peerinfo/peerinfo_api.c
+++ b/src/peerinfo/peerinfo_api.c
@@ -216,15 +216,11 @@ info_handler (void *cls, const struct GNUNET_MessageHeader *msg)
     }
 #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,