[GNUnet-SVN] r28256 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2013-07-22 23:46:28 +0200 (Mon, 22 Jul 2013)
New Revision: 28256

Modified:
   gnunet/src/mesh/gnunet-service-mesh.c
Log:
- remove assertion: can happen that if both own and cli send a destroy tunnel, 
funcion will be called twice, this is not an error

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2013-07-22 18:15:20 UTC (rev 
28255)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2013-07-22 21:46:28 UTC (rev 
28256)
@@ -1097,19 +1097,21 @@
 static void
 client_delete_tunnel (struct MeshClient *c, struct MeshTunnel *t)
 {
+  int res;
+
   if (c == t->owner)
   {
-    GNUNET_assert (GNUNET_YES ==
-                   GNUNET_CONTAINER_multihashmap32_remove (c->own_tunnels,
-                                                           t->local_tid,
-                                                           t));
+    res = GNUNET_CONTAINER_multihashmap32_remove (c->own_tunnels,
+                                                  t->local_tid, t);
+    if (GNUNET_YES != res)
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "client_delete_tunnel owner KO\n");
   }
   if (c == t->client)
   {
-    GNUNET_assert (GNUNET_YES ==
-                   GNUNET_CONTAINER_multihashmap32_remove (c->incoming_tunnels,
-                                                           t->local_tid_dest,
-                                                           t));
+    res = GNUNET_CONTAINER_multihashmap32_remove (c->incoming_tunnels,
+                                                  t->local_tid_dest, t);
+    if (GNUNET_YES != res)
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "client_delete_tunnel client KO\n");
   }
 }