diff options
Diffstat (limited to 'src/multicast/multicast_api.c')
-rw-r--r-- | src/multicast/multicast_api.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c index ce36ef6f2..75b2d8852 100644 --- a/src/multicast/multicast_api.c +++ b/src/multicast/multicast_api.c | |||
@@ -205,7 +205,7 @@ 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 | GNUNET_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 | GNUNET_free (cmsg); |
211 | } | 211 | } |
@@ -625,9 +625,9 @@ GNUNET_MULTICAST_join_decision (struct GNUNET_MULTICAST_JoinHandle *join, | |||
625 | dcsn->is_admitted = htonl (is_admitted); | 625 | dcsn->is_admitted = htonl (is_admitted); |
626 | dcsn->relay_count = htonl (relay_count); | 626 | dcsn->relay_count = htonl (relay_count); |
627 | if (0 < relay_size) | 627 | if (0 < relay_size) |
628 | memcpy (&dcsn[1], relays, relay_size); | 628 | GNUNET_memcpy (&dcsn[1], relays, relay_size); |
629 | if (0 < join_resp_size) | 629 | if (0 < join_resp_size) |
630 | memcpy (((char *) &dcsn[1]) + relay_size, join_resp, join_resp_size); | 630 | GNUNET_memcpy (((char *) &dcsn[1]) + relay_size, join_resp, join_resp_size); |
631 | 631 | ||
632 | GNUNET_CLIENT_MANAGER_transmit (grp->client, &hdcsn->header); | 632 | GNUNET_CLIENT_MANAGER_transmit (grp->client, &hdcsn->header); |
633 | GNUNET_free (hdcsn); | 633 | GNUNET_free (hdcsn); |
@@ -670,7 +670,7 @@ GNUNET_MULTICAST_replay_response (struct GNUNET_MULTICAST_ReplayHandle *rh, | |||
670 | if (GNUNET_MULTICAST_REC_OK == ec) | 670 | if (GNUNET_MULTICAST_REC_OK == ec) |
671 | { | 671 | { |
672 | GNUNET_assert (NULL != msg); | 672 | GNUNET_assert (NULL != msg); |
673 | memcpy (&res[1], msg, msg_size); | 673 | GNUNET_memcpy (&res[1], msg, msg_size); |
674 | } | 674 | } |
675 | 675 | ||
676 | GNUNET_CLIENT_MANAGER_transmit (rh->grp->client, &res->header); | 676 | GNUNET_CLIENT_MANAGER_transmit (rh->grp->client, &res->header); |
@@ -781,7 +781,7 @@ GNUNET_MULTICAST_origin_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
781 | start->header.type = htons (GNUNET_MESSAGE_TYPE_MULTICAST_ORIGIN_START); | 781 | start->header.type = htons (GNUNET_MESSAGE_TYPE_MULTICAST_ORIGIN_START); |
782 | start->header.size = htons (sizeof (*start)); | 782 | start->header.size = htons (sizeof (*start)); |
783 | start->max_fragment_id = max_fragment_id; | 783 | start->max_fragment_id = max_fragment_id; |
784 | memcpy (&start->group_key, priv_key, sizeof (*priv_key)); | 784 | GNUNET_memcpy (&start->group_key, priv_key, sizeof (*priv_key)); |
785 | 785 | ||
786 | grp->connect_msg = (struct GNUNET_MessageHeader *) start; | 786 | grp->connect_msg = (struct GNUNET_MessageHeader *) start; |
787 | grp->is_origin = GNUNET_YES; | 787 | grp->is_origin = GNUNET_YES; |
@@ -1024,9 +1024,9 @@ GNUNET_MULTICAST_member_join (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
1024 | join->origin = *origin; | 1024 | join->origin = *origin; |
1025 | join->relay_count = ntohl (relay_count); | 1025 | join->relay_count = ntohl (relay_count); |
1026 | if (0 < relay_size) | 1026 | if (0 < relay_size) |
1027 | memcpy (&join[1], relays, relay_size); | 1027 | GNUNET_memcpy (&join[1], relays, relay_size); |
1028 | if (0 < join_msg_size) | 1028 | if (0 < join_msg_size) |
1029 | memcpy (((char *) &join[1]) + relay_size, join_msg, join_msg_size); | 1029 | GNUNET_memcpy (((char *) &join[1]) + relay_size, join_msg, join_msg_size); |
1030 | 1030 | ||
1031 | grp->connect_msg = (struct GNUNET_MessageHeader *) join; | 1031 | grp->connect_msg = (struct GNUNET_MessageHeader *) join; |
1032 | grp->is_origin = GNUNET_NO; | 1032 | grp->is_origin = GNUNET_NO; |