[GNUnet-SVN] r8695 - in gnunet: . src/transport

[gnunet]

Author: grothoff
Date: 2009-07-14 17:02:30 -0600 (Tue, 14 Jul 2009)
New Revision: 8695

Modified:
   gnunet/TODO
   gnunet/src/transport/gnunet-service-transport.c
   gnunet/src/transport/plugin_transport_tcp.c
Log:
notes

Modified: gnunet/TODO
===================================================================
--- gnunet/TODO 2009-07-14 22:38:23 UTC (rev 8694)
+++ gnunet/TODO 2009-07-14 23:02:30 UTC (rev 8695)
@@ -1,5 +1,16 @@
 PHASE #1: (Goal: settle key design questions)
 
+TRANSPORT:
+* testcase currently fails; primary cause is that HELLO validation
+  fails (again).  I suspect that what is going on is that the
+  first connection attempt (which fails because HELLOs are not yet 
+  validated) causes a 'disconnect' (intentionally, to trigger 
+  another round of TRY_CONNECT 750ms later) which as a side-effect
+  somehow kills HELLO validation (at least that's my best guess;
+  somewhere someone somehow manages to close the HELLO-validation
+  connections before they have a chance to succeed with the PING
+  PONG game...)
+
 Util:
 * improve disk API [Nils] (Nils, is this done? -Christian)
 * Windows: use events instead of pipes to signal select()s [Nils]

Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2009-07-14 22:38:23 UTC 
(rev 8694)
+++ gnunet/src/transport/gnunet-service-transport.c     2009-07-14 23:02:30 UTC 
(rev 8695)
@@ -885,8 +885,6 @@
      another message (if available) */
   if (result == GNUNET_OK)
     try_transmission_to_peer (n);
-  else
-    disconnect_neighbour (n);
 }
 
 
@@ -2049,6 +2047,7 @@
           service_context->plugin_handle = NULL;
         }
       /* TODO: call stats */
+      disconnect_neighbour (n);
       return NULL;
     }
 #if DEBUG_TRANSPORT

Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2009-07-14 22:38:23 UTC (rev 
8694)
+++ gnunet/src/transport/plugin_transport_tcp.c 2009-07-14 23:02:30 UTC (rev 
8695)
@@ -686,10 +686,11 @@
 #if DEBUG_TCP
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
                    "tcp",
-                   "Creating new session %p with `%s' based on `%s' 
request.\n",
+                   "Creating new session %p with `%s' for `%4s' based on `%s' 
request.\n",
                    session, 
-                  GNUNET_a2s(addr, addrlen),
-                  "validate");
+                  GNUNET_a2s (addr, addrlen),
+                  GNUNET_i2s (&session->target),
+                  "VALIDATE");
 #endif
   return session;
 }
@@ -1869,23 +1870,19 @@
   struct Plugin *plugin = cls;
   struct Session *session;
 
+  session = find_session_by_client (plugin, client);
+  if (session == NULL)
+    return;                     /* unknown, nothing to do */
 #if DEBUG_TCP
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
                    "tcp",
-                   "Notified about network-level disconnect from peer `%4s' at 
%s (%p).\n",
+                   "Destroying session of `%4s' with %s (%p) due to 
network-level disconnect.\n",
                   GNUNET_i2s(&session->target),
                   (session->connect_addr != NULL) ? 
                   GNUNET_a2s(session->connect_addr,
                              session->connect_alen) : "*",
                    client);
 #endif
-  session = find_session_by_client (plugin, client);
-  if (session == NULL)
-    return;                     /* unknown, nothing to do */
-#if DEBUG_TCP
-  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
-                   "tcp", "Will now destroy session %p.\n", session);
-#endif
   disconnect_session (session);
 }