From: Bart Polot <bart@net.in.tum.de>
Date: Wed, 15 Oct 2014 00:55:49 +0000 (+0000)
Subject: - fix connection.c:972 assertion, mark tunnel as WAITING when an incoming connection... 
X-Git-Tag: initial-import-from-subversion-38251~3110
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f2d150bbffa2d8b965a5a17b95a2afdbed822e33;p=oweals%2Fgnunet.git

- fix connection.c:972 assertion, mark tunnel as WAITING when an incoming connection is received
---

diff --git a/src/cadet/gnunet-service-cadet_tunnel.c b/src/cadet/gnunet-service-cadet_tunnel.c
index 48f8ee09f..c6e65926b 100644
--- a/src/cadet/gnunet-service-cadet_tunnel.c
+++ b/src/cadet/gnunet-service-cadet_tunnel.c
@@ -2356,6 +2356,9 @@ GCT_add_connection (struct CadetTunnel *t, struct CadetConnection *c)
 
   GNUNET_CONTAINER_DLL_insert (t->connection_head, t->connection_tail, aux);
 
+  if (CADET_TUNNEL_SEARCHING == t->cstate)
+    GCT_change_estate (t, CADET_TUNNEL_WAITING);
+
   if (GNUNET_SCHEDULER_NO_TASK != t->trim_connections_task)
     t->trim_connections_task = GNUNET_SCHEDULER_add_now (&trim_connections, t);
 }
@@ -3056,7 +3059,7 @@ GCT_send_connection_acks (struct CadetTunnel *t)
                GCC_is_origin (iter->c, GNUNET_NO));
   }
 
-  GNUNET_break (to_allow == 0);
+  GNUNET_break (to_allow == 0); //FIXME tripped
 }