diff options
author | Bart Polot <bart@net.in.tum.de> | 2014-10-15 00:55:49 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2014-10-15 00:55:49 +0000 |
commit | f2d150bbffa2d8b965a5a17b95a2afdbed822e33 (patch) | |
tree | e6d5b91e7afba09d52627f6084457b5d57a46f6b /src/cadet | |
parent | 4fe86c4025743f94b7a476fb9f190ae78ef04848 (diff) | |
download | gnunet-f2d150bbffa2d8b965a5a17b95a2afdbed822e33.tar.gz gnunet-f2d150bbffa2d8b965a5a17b95a2afdbed822e33.zip |
- fix connection.c:972 assertion, mark tunnel as WAITING when an incoming connection is received
Diffstat (limited to 'src/cadet')
-rw-r--r-- | src/cadet/gnunet-service-cadet_tunnel.c | 5 |
1 files changed, 4 insertions, 1 deletions
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) | |||
2356 | 2356 | ||
2357 | GNUNET_CONTAINER_DLL_insert (t->connection_head, t->connection_tail, aux); | 2357 | GNUNET_CONTAINER_DLL_insert (t->connection_head, t->connection_tail, aux); |
2358 | 2358 | ||
2359 | if (CADET_TUNNEL_SEARCHING == t->cstate) | ||
2360 | GCT_change_estate (t, CADET_TUNNEL_WAITING); | ||
2361 | |||
2359 | if (GNUNET_SCHEDULER_NO_TASK != t->trim_connections_task) | 2362 | if (GNUNET_SCHEDULER_NO_TASK != t->trim_connections_task) |
2360 | t->trim_connections_task = GNUNET_SCHEDULER_add_now (&trim_connections, t); | 2363 | t->trim_connections_task = GNUNET_SCHEDULER_add_now (&trim_connections, t); |
2361 | } | 2364 | } |
@@ -3056,7 +3059,7 @@ GCT_send_connection_acks (struct CadetTunnel *t) | |||
3056 | GCC_is_origin (iter->c, GNUNET_NO)); | 3059 | GCC_is_origin (iter->c, GNUNET_NO)); |
3057 | } | 3060 | } |
3058 | 3061 | ||
3059 | GNUNET_break (to_allow == 0); | 3062 | GNUNET_break (to_allow == 0); //FIXME tripped |
3060 | } | 3063 | } |
3061 | 3064 | ||
3062 | 3065 | ||