From 93ea24d9cde704d1c8465bb5b2665855b37256a3 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 29 Jan 2017 20:33:43 +0100 Subject: [PATCH] remove route also from routes --- src/cadet/cadet.conf.in | 2 +- src/cadet/gnunet-service-cadet-new_core.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/cadet/cadet.conf.in b/src/cadet/cadet.conf.in index 296a648e2..86ba2e535 100644 --- a/src/cadet/cadet.conf.in +++ b/src/cadet/cadet.conf.in @@ -4,7 +4,7 @@ AUTOSTART = @AUTOSTART@ @JAVAPORT@PORT = 2096 HOSTNAME = localhost BINARY = gnunet-service-cadet-new -PREFIX = valgrind --leak-check=yes +# PREFIX = valgrind --leak-check=yes ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-cadet.sock diff --git a/src/cadet/gnunet-service-cadet-new_core.c b/src/cadet/gnunet-service-cadet-new_core.c index b79b87de8..fda4a7b84 100644 --- a/src/cadet/gnunet-service-cadet-new_core.c +++ b/src/cadet/gnunet-service-cadet-new_core.c @@ -326,6 +326,10 @@ destroy_route (struct CadetRoute *route) GNUNET_sh2s (&route->cid.connection_of_tunnel)); GNUNET_assert (route == GNUNET_CONTAINER_heap_remove_node (route->hn)); + GNUNET_assert (GNUNET_YES == + GNUNET_CONTAINER_multishortmap_remove (routes, + &route->cid.connection_of_tunnel, + route)); destroy_direction (&route->prev); destroy_direction (&route->next); GNUNET_free (route); -- 2.25.1