mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-29 13:38:26 +00:00
u_int#_t -> isc_uint#_t
This commit is contained in:
parent
a963386d02
commit
a3bcfd4660
@ -15,7 +15,7 @@
|
|||||||
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* $Id: netaddr.h,v 1.22 2002/10/24 03:52:34 marka Exp $ */
|
/* $Id: netaddr.h,v 1.23 2002/10/28 02:16:20 marka Exp $ */
|
||||||
|
|
||||||
#ifndef ISC_NETADDR_H
|
#ifndef ISC_NETADDR_H
|
||||||
#define ISC_NETADDR_H 1
|
#define ISC_NETADDR_H 1
|
||||||
@ -32,7 +32,7 @@ struct isc_netaddr {
|
|||||||
struct in_addr in;
|
struct in_addr in;
|
||||||
struct in6_addr in6;
|
struct in6_addr in6;
|
||||||
} type;
|
} type;
|
||||||
u_int32_t zone;
|
isc_uint32_t zone;
|
||||||
};
|
};
|
||||||
|
|
||||||
isc_boolean_t
|
isc_boolean_t
|
||||||
@ -96,9 +96,9 @@ void
|
|||||||
isc_netaddr_fromin6(isc_netaddr_t *netaddr, const struct in6_addr *ina6);
|
isc_netaddr_fromin6(isc_netaddr_t *netaddr, const struct in6_addr *ina6);
|
||||||
|
|
||||||
void
|
void
|
||||||
isc_netaddr_setzone(isc_netaddr_t *netaddr, u_int32_t zone);
|
isc_netaddr_setzone(isc_netaddr_t *netaddr, isc_uint32_t zone);
|
||||||
|
|
||||||
u_int32_t
|
isc_uint32_t
|
||||||
isc_netaddr_getzone(const isc_netaddr_t *netaddr);
|
isc_netaddr_getzone(const isc_netaddr_t *netaddr);
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* $Id: interfaceiter.c,v 1.28 2002/10/24 03:52:34 marka Exp $ */
|
/* $Id: interfaceiter.c,v 1.29 2002/10/28 02:16:21 marka Exp $ */
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
@ -92,14 +92,14 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src) {
|
|||||||
* we only consider unicast link-local addresses.
|
* we only consider unicast link-local addresses.
|
||||||
*/
|
*/
|
||||||
if (IN6_IS_ADDR_LINKLOCAL(&sa6->sin6_addr)) {
|
if (IN6_IS_ADDR_LINKLOCAL(&sa6->sin6_addr)) {
|
||||||
u_int16_t zone;
|
isc_uint16_t zone;
|
||||||
|
|
||||||
memcpy(&zone, &sa6->sin6_addr.s6_addr[2],
|
memcpy(&zone, &sa6->sin6_addr.s6_addr[2],
|
||||||
sizeof(zone));
|
sizeof(zone));
|
||||||
zone = ntohs(zone);
|
zone = ntohs(zone);
|
||||||
if (zone != 0) { /* the zone ID is embedded */
|
if (zone != 0) { /* the zone ID is embedded */
|
||||||
isc_netaddr_setzone(dst,
|
isc_netaddr_setzone(dst,
|
||||||
(u_int32_t)zone);
|
(isc_uint32_t)zone);
|
||||||
dst->type.in6.s6_addr[2] = 0;
|
dst->type.in6.s6_addr[2] = 0;
|
||||||
dst->type.in6.s6_addr[3] = 0;
|
dst->type.in6.s6_addr[3] = 0;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user