diff options
Diffstat (limited to 'src/psyc/psyc_api.c')
-rw-r--r-- | src/psyc/psyc_api.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/psyc/psyc_api.c b/src/psyc/psyc_api.c index 441c74a08..515a2731a 100644 --- a/src/psyc/psyc_api.c +++ b/src/psyc/psyc_api.c | |||
@@ -224,7 +224,7 @@ channel_send_connect_msg (struct GNUNET_PSYC_Channel *chn) | |||
224 | { | 224 | { |
225 | uint16_t cmsg_size = ntohs (chn->connect_msg->size); | 225 | uint16_t cmsg_size = ntohs (chn->connect_msg->size); |
226 | struct GNUNET_MessageHeader *cmsg = GNUNET_malloc (cmsg_size); | 226 | struct GNUNET_MessageHeader *cmsg = GNUNET_malloc (cmsg_size); |
227 | memcpy (cmsg, chn->connect_msg, cmsg_size); | 227 | GNUNET_memcpy (cmsg, chn->connect_msg, cmsg_size); |
228 | GNUNET_CLIENT_MANAGER_transmit_now (chn->client, cmsg); | 228 | GNUNET_CLIENT_MANAGER_transmit_now (chn->client, cmsg); |
229 | GNUNET_free (cmsg); | 229 | GNUNET_free (cmsg); |
230 | } | 230 | } |
@@ -760,7 +760,7 @@ GNUNET_PSYC_join_decision (struct GNUNET_PSYC_JoinHandle *jh, | |||
760 | dcsn->slave_pub_key = jh->slave_pub_key; | 760 | dcsn->slave_pub_key = jh->slave_pub_key; |
761 | 761 | ||
762 | if (0 < join_resp_size) | 762 | if (0 < join_resp_size) |
763 | memcpy (&dcsn[1], join_resp, join_resp_size); | 763 | GNUNET_memcpy (&dcsn[1], join_resp, join_resp_size); |
764 | 764 | ||
765 | GNUNET_CLIENT_MANAGER_transmit (chn->client, &dcsn->header); | 765 | GNUNET_CLIENT_MANAGER_transmit (chn->client, &dcsn->header); |
766 | GNUNET_free (dcsn); | 766 | GNUNET_free (dcsn); |
@@ -908,10 +908,10 @@ GNUNET_PSYC_slave_join (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
908 | req->flags = htonl (flags); | 908 | req->flags = htonl (flags); |
909 | 909 | ||
910 | if (0 < relay_size) | 910 | if (0 < relay_size) |
911 | memcpy (&req[1], relays, relay_size); | 911 | GNUNET_memcpy (&req[1], relays, relay_size); |
912 | 912 | ||
913 | if (NULL != join_msg) | 913 | if (NULL != join_msg) |
914 | memcpy ((char *) &req[1] + relay_size, join_msg, join_msg_size); | 914 | GNUNET_memcpy ((char *) &req[1] + relay_size, join_msg, join_msg_size); |
915 | 915 | ||
916 | chn->connect_msg = &req->header; | 916 | chn->connect_msg = &req->header; |
917 | chn->cfg = cfg; | 917 | chn->cfg = cfg; |
@@ -1170,7 +1170,7 @@ channel_history_replay (struct GNUNET_PSYC_Channel *chn, | |||
1170 | req->message_limit = GNUNET_htonll (message_limit); | 1170 | req->message_limit = GNUNET_htonll (message_limit); |
1171 | req->flags = htonl (flags); | 1171 | req->flags = htonl (flags); |
1172 | req->op_id = GNUNET_htonll (hist->op_id); | 1172 | req->op_id = GNUNET_htonll (hist->op_id); |
1173 | memcpy (&req[1], method_prefix, method_size); | 1173 | GNUNET_memcpy (&req[1], method_prefix, method_size); |
1174 | 1174 | ||
1175 | GNUNET_CLIENT_MANAGER_transmit (chn->client, &req->header); | 1175 | GNUNET_CLIENT_MANAGER_transmit (chn->client, &req->header); |
1176 | GNUNET_free (req); | 1176 | GNUNET_free (req); |
@@ -1311,7 +1311,7 @@ channel_state_get (struct GNUNET_PSYC_Channel *chn, | |||
1311 | req->header.type = htons (type); | 1311 | req->header.type = htons (type); |
1312 | req->header.size = htons (sizeof (*req) + name_size); | 1312 | req->header.size = htons (sizeof (*req) + name_size); |
1313 | req->op_id = GNUNET_htonll (sr->op_id); | 1313 | req->op_id = GNUNET_htonll (sr->op_id); |
1314 | memcpy (&req[1], name, name_size); | 1314 | GNUNET_memcpy (&req[1], name, name_size); |
1315 | 1315 | ||
1316 | GNUNET_CLIENT_MANAGER_transmit (chn->client, &req->header); | 1316 | GNUNET_CLIENT_MANAGER_transmit (chn->client, &req->header); |
1317 | GNUNET_free (req); | 1317 | GNUNET_free (req); |