[GNUnet-SVN] r15241 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2011-05-17 16:05:44 +0200 (Tue, 17 May 2011)
New Revision: 15241

Modified:
   gnunet/src/transport/gnunet-service-transport.c
Log:
fixed: transport disconnects when inbound sessions exists


Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2011-05-17 12:41:34 UTC 
(rev 15240)
+++ gnunet/src/transport/gnunet-service-transport.c     2011-05-17 14:05:44 UTC 
(rev 15241)
@@ -2577,7 +2577,7 @@
                  GNUNET_i2s(peer));
 #endif
       //FIXME: This conflicts with inbound tcp connections and tcp nat ... 
debugging in progress
-      //disconnect_neighbour (nl, GNUNET_YES);
+      disconnect_neighbour (nl, GNUNET_YES);
       return; /* was never marked as connected */
     }
   pos->session = NULL;
@@ -4917,7 +4917,8 @@
           peer_addresses = rpos->addresses;
           while (peer_addresses != NULL)
             {
-              if (GNUNET_YES == peer_addresses->connected)
+                 // Do not disconnect if: an address is connected or an 
inbound address exists
+              if ((GNUNET_YES == peer_addresses->connected) || 
(peer_addresses->addrlen == 0))
                 {
 #if DEBUG_TRANSPORT
                   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,