diff options
Diffstat (limited to 'src/multicast/gnunet-service-multicast.c')
-rw-r--r-- | src/multicast/gnunet-service-multicast.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c index 94f9d2f88..55c269874 100644 --- a/src/multicast/gnunet-service-multicast.c +++ b/src/multicast/gnunet-service-multicast.c | |||
@@ -727,7 +727,7 @@ cadet_notify_transmit_ready (void *cls, size_t buf_size, void *buf) | |||
727 | struct Channel *chn = tcls->chn; | 727 | struct Channel *chn = tcls->chn; |
728 | uint16_t msg_size = ntohs (tcls->msg->size); | 728 | uint16_t msg_size = ntohs (tcls->msg->size); |
729 | GNUNET_assert (msg_size <= buf_size); | 729 | GNUNET_assert (msg_size <= buf_size); |
730 | memcpy (buf, tcls->msg, msg_size); | 730 | GNUNET_memcpy (buf, tcls->msg, msg_size); |
731 | GNUNET_free (tcls); | 731 | GNUNET_free (tcls); |
732 | 732 | ||
733 | if (0 == chn->msgs_pending) | 733 | if (0 == chn->msgs_pending) |
@@ -1051,7 +1051,7 @@ client_recv_member_join (void *cls, struct GNUNET_SERVER_Client *client, | |||
1051 | req->peer = this_peer; | 1051 | req->peer = this_peer; |
1052 | GNUNET_CRYPTO_ecdsa_key_get_public (&mem->priv_key, &req->member_pub_key); | 1052 | GNUNET_CRYPTO_ecdsa_key_get_public (&mem->priv_key, &req->member_pub_key); |
1053 | if (0 < join_msg_size) | 1053 | if (0 < join_msg_size) |
1054 | memcpy (&req[1], join_msg, join_msg_size); | 1054 | GNUNET_memcpy (&req[1], join_msg, join_msg_size); |
1055 | 1055 | ||
1056 | req->member_pub_key = mem->pub_key; | 1056 | req->member_pub_key = mem->pub_key; |
1057 | req->purpose.size = htonl (msg_size | 1057 | req->purpose.size = htonl (msg_size |
@@ -1092,7 +1092,7 @@ client_send_join_decision (struct Member *mem, | |||
1092 | { /* Member admitted, store join_decision. */ | 1092 | { /* Member admitted, store join_decision. */ |
1093 | uint16_t dcsn_size = ntohs (dcsn->header.size); | 1093 | uint16_t dcsn_size = ntohs (dcsn->header.size); |
1094 | mem->join_dcsn = GNUNET_malloc (dcsn_size); | 1094 | mem->join_dcsn = GNUNET_malloc (dcsn_size); |
1095 | memcpy (mem->join_dcsn, dcsn, dcsn_size); | 1095 | GNUNET_memcpy (mem->join_dcsn, dcsn, dcsn_size); |
1096 | } | 1096 | } |
1097 | else | 1097 | else |
1098 | { /* Refused entry, but replay would be still possible for past members. */ | 1098 | { /* Refused entry, but replay would be still possible for past members. */ |
@@ -1620,7 +1620,7 @@ cadet_recv_join_decision (void *cls, | |||
1620 | struct MulticastJoinDecisionMessageHeader * | 1620 | struct MulticastJoinDecisionMessageHeader * |
1621 | hdcsn = GNUNET_malloc (sizeof (*hdcsn) + size); | 1621 | hdcsn = GNUNET_malloc (sizeof (*hdcsn) + size); |
1622 | hdcsn->peer = chn->peer; | 1622 | hdcsn->peer = chn->peer; |
1623 | memcpy (&hdcsn[1], dcsn, sizeof (*hdcsn) + size); | 1623 | GNUNET_memcpy (&hdcsn[1], dcsn, sizeof (*hdcsn) + size); |
1624 | 1624 | ||
1625 | struct Member *mem = (struct Member *) chn->grp; | 1625 | struct Member *mem = (struct Member *) chn->grp; |
1626 | client_send_join_decision (mem, hdcsn); | 1626 | client_send_join_decision (mem, hdcsn); |
@@ -1745,8 +1745,8 @@ cadet_recv_replay_request (void *cls, | |||
1745 | } | 1745 | } |
1746 | struct Channel *chn = *ctx; | 1746 | struct Channel *chn = *ctx; |
1747 | 1747 | ||
1748 | memcpy (&rep, m, sizeof (rep)); | 1748 | GNUNET_memcpy (&rep, m, sizeof (rep)); |
1749 | memcpy (&rep.member_pub_key, &chn->member_pub_key, sizeof (chn->member_pub_key)); | 1749 | GNUNET_memcpy (&rep.member_pub_key, &chn->member_pub_key, sizeof (chn->member_pub_key)); |
1750 | 1750 | ||
1751 | struct GNUNET_CONTAINER_MultiHashMap * | 1751 | struct GNUNET_CONTAINER_MultiHashMap * |
1752 | grp_replay_req = GNUNET_CONTAINER_multihashmap_get (replay_req_cadet, | 1752 | grp_replay_req = GNUNET_CONTAINER_multihashmap_get (replay_req_cadet, |