From fdf868ccfe16df9b8cd2f2fa892a9a6c8a846bb6 Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Wed, 13 Feb 2013 12:18:32 +0000 Subject: [PATCH] - fix crash --- src/mesh/gnunet-service-mesh.c | 11 ++++++----- src/mesh/test_mesh_2dtorus.conf | 2 -- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 4b3ea2538..15e002b46 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c @@ -771,7 +771,7 @@ struct MeshClient 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_tid; 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 struct GNUNET_CORE_MessageHandler core_handlers[] = { 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 @@ handle_local_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client) /* 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) && diff --git a/src/mesh/test_mesh_2dtorus.conf b/src/mesh/test_mesh_2dtorus.conf index fb235fe70..708ab0a50 100644 --- a/src/mesh/test_mesh_2dtorus.conf +++ b/src/mesh/test_mesh_2dtorus.conf @@ -16,8 +16,6 @@ WEAKRANDOM = YES NUM_PEERS = 16 OVERLAY_TOPOLOGY = 2D_TORUS - - [arm] PORT = 10010 DEFAULTSERVICES = core dht mesh -- 2.25.1