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

[gnunet]

Author: bartpolot
Date: 2013-02-13 13:18:32 +0100 (Wed, 13 Feb 2013)
New Revision: 26091

Modified:
   gnunet/src/mesh/gnunet-service-mesh.c
   gnunet/src/mesh/test_mesh_2dtorus.conf
Log:
- fix crash

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2013-02-13 11:01:52 UTC (rev 
26090)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2013-02-13 12:18:32 UTC (rev 
26091)
@@ -771,7 +771,7 @@
   struct GNUNET_SERVER_Client *handle;
 
     /**
-     * Applications that this client has claimed to provide
+     * Applications that this client has claimed to provide: H(app) = app.
      */
   struct GNUNET_CONTAINER_MultiHashMap *apps;
 
@@ -997,7 +997,7 @@
 static MESH_TunnelNumber next_local_tid;
 
 /**
- * All application types provided by this peer.
+ * All application types provided by this peer: H(app) = *Client.
  */
 static struct GNUNET_CONTAINER_MultiHashMap *applications;
 
@@ -6094,9 +6094,10 @@
 static int
 deregister_app (void *cls, const struct GNUNET_HashCode * key, void *value)
 {
-  struct GNUNET_CONTAINER_MultiHashMap *h = cls;
+  struct MeshClient *c = cls;
+
   GNUNET_break (GNUNET_YES ==
-                GNUNET_CONTAINER_multihashmap_remove (h, key, value));
+                GNUNET_CONTAINER_multihashmap_remove (applications, key, c));
   return GNUNET_OK;
 }
 
@@ -6337,7 +6338,7 @@
     /* deregister clients applications */
     if (NULL != c->apps)
     {
-      GNUNET_CONTAINER_multihashmap_iterate (c->apps, &deregister_app, 
c->apps);
+      GNUNET_CONTAINER_multihashmap_iterate (c->apps, &deregister_app, c);
       GNUNET_CONTAINER_multihashmap_destroy (c->apps);
     }
     if (0 == GNUNET_CONTAINER_multihashmap_size (applications) &&

Modified: gnunet/src/mesh/test_mesh_2dtorus.conf
===================================================================
--- gnunet/src/mesh/test_mesh_2dtorus.conf      2013-02-13 11:01:52 UTC (rev 
26090)
+++ gnunet/src/mesh/test_mesh_2dtorus.conf      2013-02-13 12:18:32 UTC (rev 
26091)
@@ -16,8 +16,6 @@
 NUM_PEERS = 16
 OVERLAY_TOPOLOGY = 2D_TORUS
 
-
-
 [arm]
 PORT = 10010
 DEFAULTSERVICES = core dht mesh