diff options
author | Gabor X Toth <*@tg-x.net> | 2016-06-06 20:31:03 +0000 |
---|---|---|
committer | Gabor X Toth <*@tg-x.net> | 2016-06-06 20:31:03 +0000 |
commit | 49033aed99b605ba358ab67f9a8e25f117bdb93d (patch) | |
tree | f748a82f4065162b6555d6330952da9ff7e095d0 /src/multicast | |
parent | eaddede2ab93ecd09f4bb9514e682a2165b67718 (diff) | |
download | gnunet-49033aed99b605ba358ab67f9a8e25f117bdb93d.tar.gz gnunet-49033aed99b605ba358ab67f9a8e25f117bdb93d.zip |
fixes
Diffstat (limited to 'src/multicast')
-rw-r--r-- | src/multicast/gnunet-service-multicast.c | 4 | ||||
-rw-r--r-- | src/multicast/multicast_api.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c index f157041bc..94f9d2f88 100644 --- a/src/multicast/gnunet-service-multicast.c +++ b/src/multicast/gnunet-service-multicast.c | |||
@@ -447,6 +447,7 @@ replay_req_remove_cadet (struct Channel *chn) | |||
447 | if (c == chn) | 447 | if (c == chn) |
448 | { | 448 | { |
449 | GNUNET_CONTAINER_multihashmap_remove (grp_replay_req, &key, chn); | 449 | GNUNET_CONTAINER_multihashmap_remove (grp_replay_req, &key, chn); |
450 | GNUNET_CONTAINER_multihashmap_iterator_destroy (it); | ||
450 | return GNUNET_YES; | 451 | return GNUNET_YES; |
451 | } | 452 | } |
452 | } | 453 | } |
@@ -484,6 +485,7 @@ replay_req_remove_client (struct Group *grp, struct GNUNET_SERVER_Client *client | |||
484 | if (c == client) | 485 | if (c == client) |
485 | { | 486 | { |
486 | GNUNET_CONTAINER_multihashmap_remove (replay_req_client, &key, client); | 487 | GNUNET_CONTAINER_multihashmap_remove (replay_req_client, &key, client); |
488 | GNUNET_CONTAINER_multihashmap_iterator_destroy (it); | ||
487 | return GNUNET_YES; | 489 | return GNUNET_YES; |
488 | } | 490 | } |
489 | } | 491 | } |
@@ -759,7 +761,7 @@ cadet_send_channel (struct Channel *chn, const struct GNUNET_MessageHeader *msg) | |||
759 | GNUNET_TIME_UNIT_FOREVER_REL, | 761 | GNUNET_TIME_UNIT_FOREVER_REL, |
760 | ntohs (msg->size), | 762 | ntohs (msg->size), |
761 | &cadet_notify_transmit_ready, | 763 | &cadet_notify_transmit_ready, |
762 | (void *) msg); | 764 | tcls); |
763 | GNUNET_assert (NULL != chn->tmit_handle); | 765 | GNUNET_assert (NULL != chn->tmit_handle); |
764 | } | 766 | } |
765 | 767 | ||
diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c index 09e7a8d42..ce36ef6f2 100644 --- a/src/multicast/multicast_api.c +++ b/src/multicast/multicast_api.c | |||
@@ -204,9 +204,10 @@ static void | |||
204 | group_send_connect_msg (struct GNUNET_MULTICAST_Group *grp) | 204 | group_send_connect_msg (struct GNUNET_MULTICAST_Group *grp) |
205 | { | 205 | { |
206 | uint16_t cmsg_size = ntohs (grp->connect_msg->size); | 206 | uint16_t cmsg_size = ntohs (grp->connect_msg->size); |
207 | struct GNUNET_MessageHeader * cmsg = GNUNET_malloc (cmsg_size); | 207 | struct GNUNET_MessageHeader *cmsg = GNUNET_malloc (cmsg_size); |
208 | memcpy (cmsg, grp->connect_msg, cmsg_size); | 208 | memcpy (cmsg, grp->connect_msg, cmsg_size); |
209 | GNUNET_CLIENT_MANAGER_transmit_now (grp->client, cmsg); | 209 | GNUNET_CLIENT_MANAGER_transmit_now (grp->client, cmsg); |
210 | GNUNET_free (cmsg); | ||
210 | } | 211 | } |
211 | 212 | ||
212 | 213 | ||