aboutsummaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2011-05-17 14:05:44 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2011-05-17 14:05:44 +0000
commitabb3b5c4c50e9df157d1ebd547f844407eacd256 (patch)
tree5601bc3592496cdc3721edbcc1c348c75571d3de /src/transport
parent334f48a44244912a2d6dc5a5d904d34da6cb1330 (diff)
downloadgnunet-abb3b5c4c50e9df157d1ebd547f844407eacd256.tar.gz
gnunet-abb3b5c4c50e9df157d1ebd547f844407eacd256.zip
fixed: transport disconnects when inbound sessions exists
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/gnunet-service-transport.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 201ecf602..310f1433b 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -2577,7 +2577,7 @@ plugin_env_session_end (void *cls,
2577 GNUNET_i2s(peer)); 2577 GNUNET_i2s(peer));
2578#endif 2578#endif
2579 //FIXME: This conflicts with inbound tcp connections and tcp nat ... debugging in progress 2579 //FIXME: This conflicts with inbound tcp connections and tcp nat ... debugging in progress
2580 //disconnect_neighbour (nl, GNUNET_YES); 2580 disconnect_neighbour (nl, GNUNET_YES);
2581 return; /* was never marked as connected */ 2581 return; /* was never marked as connected */
2582 } 2582 }
2583 pos->session = NULL; 2583 pos->session = NULL;
@@ -4917,7 +4917,8 @@ disconnect_neighbour (struct NeighbourList *n, int check)
4917 peer_addresses = rpos->addresses; 4917 peer_addresses = rpos->addresses;
4918 while (peer_addresses != NULL) 4918 while (peer_addresses != NULL)
4919 { 4919 {
4920 if (GNUNET_YES == peer_addresses->connected) 4920 // Do not disconnect if: an address is connected or an inbound address exists
4921 if ((GNUNET_YES == peer_addresses->connected) || (peer_addresses->addrlen == 0))
4921 { 4922 {
4922#if DEBUG_TRANSPORT 4923#if DEBUG_TRANSPORT
4923 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 4924 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,