mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-09-02 07:35:26 +00:00
Replace custom isc_u?intNN_t types with C99 u?intNN_t types
This commit is contained in:
@@ -21,6 +21,7 @@
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <inttypes.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
@@ -96,7 +97,7 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src,
|
||||
* we only consider unicast link-local addresses.
|
||||
*/
|
||||
if (IN6_IS_ADDR_LINKLOCAL(&sa6->sin6_addr)) {
|
||||
isc_uint16_t zone16;
|
||||
uint16_t zone16;
|
||||
|
||||
memmove(&zone16, &sa6->sin6_addr.s6_addr[2],
|
||||
sizeof(zone16));
|
||||
@@ -104,7 +105,7 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src,
|
||||
if (zone16 != 0) {
|
||||
/* the zone ID is embedded */
|
||||
isc_netaddr_setzone(dst,
|
||||
(isc_uint32_t)zone16);
|
||||
(uint32_t)zone16);
|
||||
dst->type.in6.s6_addr[2] = 0;
|
||||
dst->type.in6.s6_addr[3] = 0;
|
||||
#ifdef ISC_PLATFORM_HAVEIFNAMETOINDEX
|
||||
@@ -120,7 +121,7 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src,
|
||||
zone = if_nametoindex(ifname);
|
||||
if (zone != 0) {
|
||||
isc_netaddr_setzone(dst,
|
||||
(isc_uint32_t)zone);
|
||||
(uint32_t)zone);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -219,7 +220,7 @@ linux_if_inet6_current(isc_interfaceiter_t *iter) {
|
||||
isc_netaddr_fromin6(&iter->current.address, &addr6);
|
||||
if (isc_netaddr_islinklocal(&iter->current.address)) {
|
||||
isc_netaddr_setzone(&iter->current.address,
|
||||
(isc_uint32_t)ifindex);
|
||||
(uint32_t)ifindex);
|
||||
}
|
||||
for (i = 0; i < 16; i++) {
|
||||
if (prefix > 8) {
|
||||
|
Reference in New Issue
Block a user