diff options
Diffstat (limited to 'src/dns/gnunet-service-dns.c')
-rw-r--r-- | src/dns/gnunet-service-dns.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c index b580f433f..50aa730e7 100644 --- a/src/dns/gnunet-service-dns.c +++ b/src/dns/gnunet-service-dns.c | |||
@@ -378,7 +378,7 @@ request_done (struct RequestRecord *rr) | |||
378 | tun.proto = htons (ETH_P_IPV4); | 378 | tun.proto = htons (ETH_P_IPV4); |
379 | else | 379 | else |
380 | tun.proto = htons (ETH_P_IPV6); | 380 | tun.proto = htons (ETH_P_IPV6); |
381 | memcpy (&buf[off], &tun, sizeof (struct GNUNET_TUN_Layer2PacketHeader)); | 381 | GNUNET_memcpy (&buf[off], &tun, sizeof (struct GNUNET_TUN_Layer2PacketHeader)); |
382 | off += sizeof (struct GNUNET_TUN_Layer2PacketHeader); | 382 | off += sizeof (struct GNUNET_TUN_Layer2PacketHeader); |
383 | } | 383 | } |
384 | 384 | ||
@@ -397,7 +397,7 @@ request_done (struct RequestRecord *rr) | |||
397 | reply_len - off - sizeof (struct GNUNET_TUN_IPv4Header), | 397 | reply_len - off - sizeof (struct GNUNET_TUN_IPv4Header), |
398 | &dst->sin_addr, | 398 | &dst->sin_addr, |
399 | &src->sin_addr); | 399 | &src->sin_addr); |
400 | memcpy (&buf[off], &ip4, sizeof (ip4)); | 400 | GNUNET_memcpy (&buf[off], &ip4, sizeof (ip4)); |
401 | off += sizeof (ip4); | 401 | off += sizeof (ip4); |
402 | } | 402 | } |
403 | break; | 403 | break; |
@@ -413,7 +413,7 @@ request_done (struct RequestRecord *rr) | |||
413 | reply_len - sizeof (struct GNUNET_TUN_IPv6Header), | 413 | reply_len - sizeof (struct GNUNET_TUN_IPv6Header), |
414 | &dst->sin6_addr, | 414 | &dst->sin6_addr, |
415 | &src->sin6_addr); | 415 | &src->sin6_addr); |
416 | memcpy (&buf[off], &ip6, sizeof (ip6)); | 416 | GNUNET_memcpy (&buf[off], &ip6, sizeof (ip6)); |
417 | off += sizeof (ip6); | 417 | off += sizeof (ip6); |
418 | } | 418 | } |
419 | break; | 419 | break; |
@@ -438,13 +438,13 @@ request_done (struct RequestRecord *rr) | |||
438 | &udp, | 438 | &udp, |
439 | rr->payload, | 439 | rr->payload, |
440 | rr->payload_length); | 440 | rr->payload_length); |
441 | memcpy (&buf[off], &udp, sizeof (udp)); | 441 | GNUNET_memcpy (&buf[off], &udp, sizeof (udp)); |
442 | off += sizeof (udp); | 442 | off += sizeof (udp); |
443 | } | 443 | } |
444 | 444 | ||
445 | /* now DNS payload */ | 445 | /* now DNS payload */ |
446 | { | 446 | { |
447 | memcpy (&buf[off], rr->payload, rr->payload_length); | 447 | GNUNET_memcpy (&buf[off], rr->payload, rr->payload_length); |
448 | off += rr->payload_length; | 448 | off += rr->payload_length; |
449 | } | 449 | } |
450 | /* final checks & sending */ | 450 | /* final checks & sending */ |
@@ -490,7 +490,7 @@ send_request_to_client (struct RequestRecord *rr, | |||
490 | req->header.size = htons (sizeof (buf)); | 490 | req->header.size = htons (sizeof (buf)); |
491 | req->reserved = htonl (0); | 491 | req->reserved = htonl (0); |
492 | req->request_id = rr->request_id; | 492 | req->request_id = rr->request_id; |
493 | memcpy (&req[1], rr->payload, rr->payload_length); | 493 | GNUNET_memcpy (&req[1], rr->payload, rr->payload_length); |
494 | GNUNET_SERVER_notification_context_unicast (nc, | 494 | GNUNET_SERVER_notification_context_unicast (nc, |
495 | client, | 495 | client, |
496 | &req->header, | 496 | &req->header, |
@@ -723,7 +723,7 @@ process_dns_result (void *cls, | |||
723 | (unsigned long long) rr->request_id); | 723 | (unsigned long long) rr->request_id); |
724 | GNUNET_free_non_null (rr->payload); | 724 | GNUNET_free_non_null (rr->payload); |
725 | rr->payload = GNUNET_malloc (r); | 725 | rr->payload = GNUNET_malloc (r); |
726 | memcpy (rr->payload, dns, r); | 726 | GNUNET_memcpy (rr->payload, dns, r); |
727 | rr->payload_length = r; | 727 | rr->payload_length = r; |
728 | next_phase (rr); | 728 | next_phase (rr); |
729 | } | 729 | } |
@@ -825,7 +825,7 @@ handle_client_response (void *cls GNUNET_UNUSED, | |||
825 | "Changing DNS reply according to client specifications\n"); | 825 | "Changing DNS reply according to client specifications\n"); |
826 | rr->payload = GNUNET_malloc (msize); | 826 | rr->payload = GNUNET_malloc (msize); |
827 | rr->payload_length = msize; | 827 | rr->payload_length = msize; |
828 | memcpy (rr->payload, &resp[1], msize); | 828 | GNUNET_memcpy (rr->payload, &resp[1], msize); |
829 | if (rr->phase == RP_QUERY) | 829 | if (rr->phase == RP_QUERY) |
830 | { | 830 | { |
831 | /* clear wait list, we're moving to MODIFY phase next */ | 831 | /* clear wait list, we're moving to MODIFY phase next */ |
@@ -1000,7 +1000,7 @@ process_helper_messages (void *cls GNUNET_UNUSED, void *client, | |||
1000 | } | 1000 | } |
1001 | rr->payload = GNUNET_malloc (msize); | 1001 | rr->payload = GNUNET_malloc (msize); |
1002 | rr->payload_length = msize; | 1002 | rr->payload_length = msize; |
1003 | memcpy (rr->payload, dns, msize); | 1003 | GNUNET_memcpy (rr->payload, dns, msize); |
1004 | rr->request_id = dns->id | (request_id_gen << 16); | 1004 | rr->request_id = dns->id | (request_id_gen << 16); |
1005 | request_id_gen++; | 1005 | request_id_gen++; |
1006 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1006 | LOG (GNUNET_ERROR_TYPE_DEBUG, |