diff options
Diffstat (limited to 'src/util/win.c')
-rw-r--r-- | src/util/win.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/util/win.c b/src/util/win.c index 88543de7b..7cd7e0f3c 100644 --- a/src/util/win.c +++ b/src/util/win.c | |||
@@ -500,7 +500,7 @@ EnumNICs3 (struct EnumNICs3_results **results, int *results_count) | |||
500 | 500 | ||
501 | if (!use_enum2) | 501 | if (!use_enum2) |
502 | { | 502 | { |
503 | memcpy (&r->address, unicast->Address.lpSockaddr, | 503 | GNUNET_memcpy (&r->address, unicast->Address.lpSockaddr, |
504 | unicast->Address.iSockaddrLength); | 504 | unicast->Address.iSockaddrLength); |
505 | memset (&r->mask, 0, sizeof (struct sockaddr)); | 505 | memset (&r->mask, 0, sizeof (struct sockaddr)); |
506 | mask_length = ((IP_ADAPTER_UNICAST_ADDRESS_VISTA *) unicast)-> | 506 | mask_length = ((IP_ADAPTER_UNICAST_ADDRESS_VISTA *) unicast)-> |
@@ -520,7 +520,7 @@ EnumNICs3 (struct EnumNICs3_results **results, int *results_count) | |||
520 | struct sockaddr_in6 *b = (struct sockaddr_in6 *) &r->broadcast; | 520 | struct sockaddr_in6 *b = (struct sockaddr_in6 *) &r->broadcast; |
521 | for (i = 0; i < mask_length; i++) | 521 | for (i = 0; i < mask_length; i++) |
522 | ((unsigned char *) &m->sin6_addr)[i / 8] |= 0x80 >> (i % 8); | 522 | ((unsigned char *) &m->sin6_addr)[i / 8] |= 0x80 >> (i % 8); |
523 | memcpy (&r->broadcast, &r->address, unicast->Address.iSockaddrLength); | 523 | GNUNET_memcpy (&r->broadcast, &r->address, unicast->Address.iSockaddrLength); |
524 | for (i = mask_length; i < 128; i++) | 524 | for (i = mask_length; i < 128; i++) |
525 | ((unsigned char *) &b->sin6_addr)[i / 8] |= 0x80 >> (i % 8); | 525 | ((unsigned char *) &b->sin6_addr)[i / 8] |= 0x80 >> (i % 8); |
526 | } | 526 | } |
@@ -534,14 +534,14 @@ EnumNICs3 (struct EnumNICs3_results **results, int *results_count) | |||
534 | for (i = 0; !found && i < interfaces4_len / sizeof (INTERFACE_INFO); i++) | 534 | for (i = 0; !found && i < interfaces4_len / sizeof (INTERFACE_INFO); i++) |
535 | { | 535 | { |
536 | struct sockaddr_in *m = (struct sockaddr_in *) &r->mask; | 536 | struct sockaddr_in *m = (struct sockaddr_in *) &r->mask; |
537 | if (memcpy (&interfaces4[i].iiAddress.Address, | 537 | if (GNUNET_memcpy (&interfaces4[i].iiAddress.Address, |
538 | unicast->Address.lpSockaddr, | 538 | unicast->Address.lpSockaddr, |
539 | unicast->Address.iSockaddrLength) != 0) | 539 | unicast->Address.iSockaddrLength) != 0) |
540 | continue; | 540 | continue; |
541 | found = 1; | 541 | found = 1; |
542 | memcpy (&r->address, &interfaces4[i].iiAddress.Address, | 542 | GNUNET_memcpy (&r->address, &interfaces4[i].iiAddress.Address, |
543 | sizeof (struct sockaddr_in)); | 543 | sizeof (struct sockaddr_in)); |
544 | memcpy (&r->mask, &interfaces4[i].iiNetmask.Address, | 544 | GNUNET_memcpy (&r->mask, &interfaces4[i].iiNetmask.Address, |
545 | sizeof (struct sockaddr_in)); | 545 | sizeof (struct sockaddr_in)); |
546 | for (mask_length = 0; | 546 | for (mask_length = 0; |
547 | ((unsigned char *) &m->sin_addr)[mask_length / 8] & | 547 | ((unsigned char *) &m->sin_addr)[mask_length / 8] & |
@@ -557,12 +557,12 @@ EnumNICs3 (struct EnumNICs3_results **results, int *results_count) | |||
557 | interfaces6 != NULL && !found && i < interfaces6->iAddressCount; | 557 | interfaces6 != NULL && !found && i < interfaces6->iAddressCount; |
558 | i++) | 558 | i++) |
559 | { | 559 | { |
560 | if (memcpy (interfaces6->Address[i].lpSockaddr, | 560 | if (GNUNET_memcpy (interfaces6->Address[i].lpSockaddr, |
561 | unicast->Address.lpSockaddr, | 561 | unicast->Address.lpSockaddr, |
562 | unicast->Address.iSockaddrLength) != 0) | 562 | unicast->Address.iSockaddrLength) != 0) |
563 | continue; | 563 | continue; |
564 | found = 1; | 564 | found = 1; |
565 | memcpy (&r->address, interfaces6->Address[i].lpSockaddr, | 565 | GNUNET_memcpy (&r->address, interfaces6->Address[i].lpSockaddr, |
566 | sizeof (struct sockaddr_in6)); | 566 | sizeof (struct sockaddr_in6)); |
567 | /* TODO: Find a way to reliably get network mask for IPv6 on XP */ | 567 | /* TODO: Find a way to reliably get network mask for IPv6 on XP */ |
568 | memset (&r->mask, 0, sizeof (struct sockaddr)); | 568 | memset (&r->mask, 0, sizeof (struct sockaddr)); |
@@ -582,7 +582,7 @@ EnumNICs3 (struct EnumNICs3_results **results, int *results_count) | |||
582 | * falling under netmask to 1, | 582 | * falling under netmask to 1, |
583 | * so we get, 192.168.0.255 from, say, 192.168.0.43 with mask == 24. | 583 | * so we get, 192.168.0.255 from, say, 192.168.0.43 with mask == 24. |
584 | */ | 584 | */ |
585 | memcpy (&r->broadcast, &r->address, unicast->Address.iSockaddrLength); | 585 | GNUNET_memcpy (&r->broadcast, &r->address, unicast->Address.iSockaddrLength); |
586 | for (i = mask_length; i < 32; i++) | 586 | for (i = mask_length; i < 32; i++) |
587 | ((unsigned char *) &m->sin_addr)[i / 8] |= 0x80 >> (i % 8); | 587 | ((unsigned char *) &m->sin_addr)[i / 8] |= 0x80 >> (i % 8); |
588 | r->flags |= ENUMNICS3_BCAST_OK; | 588 | r->flags |= ENUMNICS3_BCAST_OK; |