diff options
Diffstat (limited to 'src/gns/gnunet-gns-proxy.c')
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 83935ff76..2671404a0 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -804,7 +804,7 @@ mhd_content_cb (void *cls, | |||
804 | "Completed MHD download\n"); | 804 | "Completed MHD download\n"); |
805 | return MHD_CONTENT_READER_END_OF_STREAM; | 805 | return MHD_CONTENT_READER_END_OF_STREAM; |
806 | } | 806 | } |
807 | memcpy (buf, s5r->io_buf, bytes_to_copy); | 807 | GNUNET_memcpy (buf, s5r->io_buf, bytes_to_copy); |
808 | memmove (s5r->io_buf, | 808 | memmove (s5r->io_buf, |
809 | &s5r->io_buf[bytes_to_copy], | 809 | &s5r->io_buf[bytes_to_copy], |
810 | s5r->io_len - bytes_to_copy); | 810 | s5r->io_len - bytes_to_copy); |
@@ -1099,7 +1099,7 @@ curl_check_hdr (void *buffer, size_t size, size_t nmemb, void *cls) | |||
1099 | _("Cookie domain `%s' supplied by server is invalid\n"), | 1099 | _("Cookie domain `%s' supplied by server is invalid\n"), |
1100 | tok); | 1100 | tok); |
1101 | } | 1101 | } |
1102 | memcpy (new_cookie_hdr + offset, tok, strlen (tok)); | 1102 | GNUNET_memcpy (new_cookie_hdr + offset, tok, strlen (tok)); |
1103 | offset += strlen (tok); | 1103 | offset += strlen (tok); |
1104 | new_cookie_hdr[offset++] = ';'; | 1104 | new_cookie_hdr[offset++] = ';'; |
1105 | } | 1105 | } |
@@ -1188,7 +1188,7 @@ curl_download_cb (void *ptr, size_t size, size_t nmemb, void* ctx) | |||
1188 | "Pausing CURL download, not enough space\n"); | 1188 | "Pausing CURL download, not enough space\n"); |
1189 | return CURL_WRITEFUNC_PAUSE; /* not enough space */ | 1189 | return CURL_WRITEFUNC_PAUSE; /* not enough space */ |
1190 | } | 1190 | } |
1191 | memcpy (&s5r->io_buf[s5r->io_len], | 1191 | GNUNET_memcpy (&s5r->io_buf[s5r->io_len], |
1192 | ptr, | 1192 | ptr, |
1193 | total); | 1193 | total); |
1194 | s5r->io_len += total; | 1194 | s5r->io_len += total; |
@@ -1238,7 +1238,7 @@ curl_upload_cb (void *buf, size_t size, size_t nmemb, void *cls) | |||
1238 | } | 1238 | } |
1239 | to_copy = GNUNET_MIN (s5r->io_len, | 1239 | to_copy = GNUNET_MIN (s5r->io_len, |
1240 | len); | 1240 | len); |
1241 | memcpy (buf, s5r->io_buf, to_copy); | 1241 | GNUNET_memcpy (buf, s5r->io_buf, to_copy); |
1242 | memmove (s5r->io_buf, | 1242 | memmove (s5r->io_buf, |
1243 | &s5r->io_buf[to_copy], | 1243 | &s5r->io_buf[to_copy], |
1244 | s5r->io_len - to_copy); | 1244 | s5r->io_len - to_copy); |
@@ -1681,7 +1681,7 @@ create_response (void *cls, | |||
1681 | { | 1681 | { |
1682 | left = GNUNET_MIN (*upload_data_size, | 1682 | left = GNUNET_MIN (*upload_data_size, |
1683 | sizeof (s5r->io_buf) - s5r->io_len); | 1683 | sizeof (s5r->io_buf) - s5r->io_len); |
1684 | memcpy (&s5r->io_buf[s5r->io_len], | 1684 | GNUNET_memcpy (&s5r->io_buf[s5r->io_len], |
1685 | upload_data, | 1685 | upload_data, |
1686 | left); | 1686 | left); |
1687 | s5r->io_len += left; | 1687 | s5r->io_len += left; |
@@ -2383,7 +2383,7 @@ handle_gns_result (void *cls, | |||
2383 | got_ip = GNUNET_YES; | 2383 | got_ip = GNUNET_YES; |
2384 | in = (struct sockaddr_in *) &s5r->destination_address; | 2384 | in = (struct sockaddr_in *) &s5r->destination_address; |
2385 | in->sin_family = AF_INET; | 2385 | in->sin_family = AF_INET; |
2386 | memcpy (&in->sin_addr, | 2386 | GNUNET_memcpy (&in->sin_addr, |
2387 | r->data, | 2387 | r->data, |
2388 | r->data_size); | 2388 | r->data_size); |
2389 | in->sin_port = htons (s5r->port); | 2389 | in->sin_port = htons (s5r->port); |
@@ -2410,7 +2410,7 @@ handle_gns_result (void *cls, | |||
2410 | got_ip = GNUNET_YES; | 2410 | got_ip = GNUNET_YES; |
2411 | in = (struct sockaddr_in6 *) &s5r->destination_address; | 2411 | in = (struct sockaddr_in6 *) &s5r->destination_address; |
2412 | in->sin6_family = AF_INET6; | 2412 | in->sin6_family = AF_INET6; |
2413 | memcpy (&in->sin6_addr, | 2413 | GNUNET_memcpy (&in->sin6_addr, |
2414 | r->data, | 2414 | r->data, |
2415 | r->data_size); | 2415 | r->data_size); |
2416 | in->sin6_port = htons (s5r->port); | 2416 | in->sin6_port = htons (s5r->port); |
@@ -2444,7 +2444,7 @@ handle_gns_result (void *cls, | |||
2444 | GNUNET_free_non_null (s5r->dane_data); | 2444 | GNUNET_free_non_null (s5r->dane_data); |
2445 | s5r->dane_data_len = r->data_size - sizeof (struct GNUNET_GNSRECORD_BoxRecord); | 2445 | s5r->dane_data_len = r->data_size - sizeof (struct GNUNET_GNSRECORD_BoxRecord); |
2446 | s5r->dane_data = GNUNET_malloc (s5r->dane_data_len); | 2446 | s5r->dane_data = GNUNET_malloc (s5r->dane_data_len); |
2447 | memcpy (s5r->dane_data, | 2447 | GNUNET_memcpy (s5r->dane_data, |
2448 | &box[1], | 2448 | &box[1], |
2449 | s5r->dane_data_len); | 2449 | s5r->dane_data_len); |
2450 | break; | 2450 | break; |