diff options
author | Bart Polot <bart@net.in.tum.de> | 2012-01-17 16:13:50 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2012-01-17 16:13:50 +0000 |
commit | 52c31cfe586839f551a07de477ddf079dc3ba31f (patch) | |
tree | 7acc4b9c7a3b0da586e2a551a451f7b6ee12be66 /src/mesh | |
parent | 027db3d46879a9a90797c04f391c96ebc3865c69 (diff) | |
download | gnunet-52c31cfe586839f551a07de477ddf079dc3ba31f.tar.gz gnunet-52c31cfe586839f551a07de477ddf079dc3ba31f.zip |
Temporl workaround for #2070
Diffstat (limited to 'src/mesh')
-rw-r--r-- | src/mesh/gnunet-service-mesh.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 983aeae9c..033c28eb0 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c | |||
@@ -723,17 +723,17 @@ client_is_subscribed (uint16_t message_type, struct MeshClient *c) | |||
723 | static void | 723 | static void |
724 | client_allow_send (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 724 | client_allow_send (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
725 | { | 725 | { |
726 | struct MeshDataDescriptor *info = cls; | 726 | struct MeshClient *c = cls; |
727 | 727 | ||
728 | if (GNUNET_SCHEDULER_REASON_SHUTDOWN == tc->reason) | 728 | if (GNUNET_SCHEDULER_REASON_SHUTDOWN == tc->reason) |
729 | return; | 729 | return; |
730 | #if MESH_DEBUG | 730 | #if 0 |
731 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 731 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
732 | "MESH: CLIENT ALLOW SEND DESPITE %u COPIES PENDING\n", | 732 | "MESH: CLIENT ALLOW SEND DESPITE %u COPIES PENDING\n", |
733 | (info->copies != NULL) ? *(info->copies) : 0); | 733 | (info->copies != NULL) ? *(info->copies) : 0); |
734 | #endif | 734 | #endif |
735 | *(info->timeout_task) = GNUNET_SCHEDULER_NO_TASK; | 735 | // *(info->timeout_task) = GNUNET_SCHEDULER_NO_TASK; |
736 | GNUNET_SERVER_receive_done (info->client, GNUNET_OK); | 736 | GNUNET_SERVER_receive_done (c, GNUNET_OK); |
737 | } | 737 | } |
738 | 738 | ||
739 | 739 | ||
@@ -1994,6 +1994,9 @@ struct MeshMulticastData | |||
1994 | 1994 | ||
1995 | /** | 1995 | /** |
1996 | * Send a multicast packet to a neighbor. | 1996 | * Send a multicast packet to a neighbor. |
1997 | * | ||
1998 | * @param cls Closure (Info about the multicast packet) | ||
1999 | * @param neighbor_id Short ID of the neighbor to send the packet to. | ||
1997 | */ | 2000 | */ |
1998 | static void | 2001 | static void |
1999 | tunnel_send_multicast_iterator (void *cls, GNUNET_PEER_Id neighbor_id) | 2002 | tunnel_send_multicast_iterator (void *cls, GNUNET_PEER_Id neighbor_id) |
@@ -2085,10 +2088,7 @@ tunnel_send_multicast (struct MeshTunnel *t, | |||
2085 | { | 2088 | { |
2086 | GNUNET_free (mdata->data); | 2089 | GNUNET_free (mdata->data); |
2087 | GNUNET_free (mdata->reference_counter); | 2090 | GNUNET_free (mdata->reference_counter); |
2088 | if (NULL != mdata->task) | 2091 | GNUNET_free_non_null (mdata->task); |
2089 | { | ||
2090 | GNUNET_free (mdata->task); | ||
2091 | } | ||
2092 | } | 2092 | } |
2093 | GNUNET_free (mdata); | 2093 | GNUNET_free (mdata); |
2094 | #if MESH_DEBUG | 2094 | #if MESH_DEBUG |