diff options
Diffstat (limited to 'src/pt')
-rw-r--r-- | src/pt/gnunet-daemon-pt.c | 14 | ||||
-rw-r--r-- | src/pt/test_gns_vpn.c | 2 | ||||
-rw-r--r-- | src/pt/test_gnunet_vpn.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/pt/gnunet-daemon-pt.c b/src/pt/gnunet-daemon-pt.c index 02c0df3cc..5d83fd883 100644 --- a/src/pt/gnunet-daemon-pt.c +++ b/src/pt/gnunet-daemon-pt.c | |||
@@ -544,11 +544,11 @@ vpn_allocation_callback (void *cls, | |||
544 | { | 544 | { |
545 | case GNUNET_DNSPARSER_TYPE_A: | 545 | case GNUNET_DNSPARSER_TYPE_A: |
546 | GNUNET_assert (AF_INET == af); | 546 | GNUNET_assert (AF_INET == af); |
547 | memcpy (rc->rec->data.raw.data, address, sizeof (struct in_addr)); | 547 | GNUNET_memcpy (rc->rec->data.raw.data, address, sizeof (struct in_addr)); |
548 | break; | 548 | break; |
549 | case GNUNET_DNSPARSER_TYPE_AAAA: | 549 | case GNUNET_DNSPARSER_TYPE_AAAA: |
550 | GNUNET_assert (AF_INET6 == af); | 550 | GNUNET_assert (AF_INET6 == af); |
551 | memcpy (rc->rec->data.raw.data, address, sizeof (struct in6_addr)); | 551 | GNUNET_memcpy (rc->rec->data.raw.data, address, sizeof (struct in6_addr)); |
552 | break; | 552 | break; |
553 | default: | 553 | default: |
554 | GNUNET_assert (0); | 554 | GNUNET_assert (0); |
@@ -776,7 +776,7 @@ transmit_dns_request_to_cadet (void *cls, | |||
776 | return 0; | 776 | return 0; |
777 | } | 777 | } |
778 | GNUNET_assert (GNUNET_NO == rc->was_transmitted); | 778 | GNUNET_assert (GNUNET_NO == rc->was_transmitted); |
779 | memcpy (buf, rc->cadet_message, mlen); | 779 | GNUNET_memcpy (buf, rc->cadet_message, mlen); |
780 | GNUNET_CONTAINER_DLL_remove (exit->transmit_queue_head, | 780 | GNUNET_CONTAINER_DLL_remove (exit->transmit_queue_head, |
781 | exit->transmit_queue_tail, | 781 | exit->transmit_queue_tail, |
782 | rc); | 782 | rc); |
@@ -896,7 +896,7 @@ dns_pre_request_handler (void *cls, | |||
896 | GNUNET_DNS_request_drop (rh); | 896 | GNUNET_DNS_request_drop (rh); |
897 | return; | 897 | return; |
898 | } | 898 | } |
899 | memcpy (&dns, request, sizeof (dns)); | 899 | GNUNET_memcpy (&dns, request, sizeof (dns)); |
900 | mlen = sizeof (struct GNUNET_MessageHeader) + request_length; | 900 | mlen = sizeof (struct GNUNET_MessageHeader) + request_length; |
901 | exit = choose_exit (); | 901 | exit = choose_exit (); |
902 | GNUNET_assert (NULL != exit); | 902 | GNUNET_assert (NULL != exit); |
@@ -912,8 +912,8 @@ dns_pre_request_handler (void *cls, | |||
912 | rc->mlen = mlen; | 912 | rc->mlen = mlen; |
913 | hdr.type = htons (GNUNET_MESSAGE_TYPE_VPN_DNS_TO_INTERNET); | 913 | hdr.type = htons (GNUNET_MESSAGE_TYPE_VPN_DNS_TO_INTERNET); |
914 | hdr.size = htons (mlen); | 914 | hdr.size = htons (mlen); |
915 | memcpy (&rc[1], &hdr, sizeof (struct GNUNET_MessageHeader)); | 915 | GNUNET_memcpy (&rc[1], &hdr, sizeof (struct GNUNET_MessageHeader)); |
916 | memcpy (&(((char*)&rc[1])[sizeof (struct GNUNET_MessageHeader)]), | 916 | GNUNET_memcpy (&(((char*)&rc[1])[sizeof (struct GNUNET_MessageHeader)]), |
917 | request, | 917 | request, |
918 | request_length); | 918 | request_length); |
919 | GNUNET_CONTAINER_DLL_insert_tail (exit->transmit_queue_head, | 919 | GNUNET_CONTAINER_DLL_insert_tail (exit->transmit_queue_head, |
@@ -957,7 +957,7 @@ receive_dns_response (void *cls, | |||
957 | GNUNET_break_op (0); | 957 | GNUNET_break_op (0); |
958 | return GNUNET_SYSERR; | 958 | return GNUNET_SYSERR; |
959 | } | 959 | } |
960 | memcpy (&dns, &message[1], sizeof (dns)); | 960 | GNUNET_memcpy (&dns, &message[1], sizeof (dns)); |
961 | for (rc = exit->receive_queue_head; NULL != rc; rc = rc->next) | 961 | for (rc = exit->receive_queue_head; NULL != rc; rc = rc->next) |
962 | { | 962 | { |
963 | GNUNET_assert (GNUNET_YES == rc->was_transmitted); | 963 | GNUNET_assert (GNUNET_YES == rc->was_transmitted); |
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c index 467a15310..4b7e817e8 100644 --- a/src/pt/test_gns_vpn.c +++ b/src/pt/test_gns_vpn.c | |||
@@ -102,7 +102,7 @@ copy_buffer (void *ptr, size_t size, size_t nmemb, void *ctx) | |||
102 | 102 | ||
103 | if (cbc->pos + size * nmemb > sizeof(cbc->buf)) | 103 | if (cbc->pos + size * nmemb > sizeof(cbc->buf)) |
104 | return 0; /* overflow */ | 104 | return 0; /* overflow */ |
105 | memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); | 105 | GNUNET_memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); |
106 | cbc->pos += size * nmemb; | 106 | cbc->pos += size * nmemb; |
107 | return size * nmemb; | 107 | return size * nmemb; |
108 | } | 108 | } |
diff --git a/src/pt/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c index 2e9dea627..6393b395f 100644 --- a/src/pt/test_gnunet_vpn.c +++ b/src/pt/test_gnunet_vpn.c | |||
@@ -93,7 +93,7 @@ copy_buffer (void *ptr, size_t size, size_t nmemb, void *ctx) | |||
93 | 93 | ||
94 | if (cbc->pos + size * nmemb > sizeof (cbc->buf)) | 94 | if (cbc->pos + size * nmemb > sizeof (cbc->buf)) |
95 | return 0; /* overflow */ | 95 | return 0; /* overflow */ |
96 | memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); | 96 | GNUNET_memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); |
97 | cbc->pos += size * nmemb; | 97 | cbc->pos += size * nmemb; |
98 | return size * nmemb; | 98 | return size * nmemb; |
99 | } | 99 | } |