Fix address advancing for i386 and other 32-bit platforms.
Makes racoon grok IPv6 addresses again on these platforms.
This commit is contained in:
parent
9ce4bce850
commit
d2c7ed0706
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: grabmyaddr.c,v 1.37 2018/05/19 20:14:56 maxv Exp $ */
|
/* $NetBSD: grabmyaddr.c,v 1.38 2020/11/25 10:57:11 kardel Exp $ */
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
||||||
* Copyright (C) 2008 Timo Teras <timo.teras@iki.fi>.
|
* Copyright (C) 2008 Timo Teras <timo.teras@iki.fi>.
|
||||||
|
@ -683,10 +683,14 @@ kernel_sync()
|
||||||
|
|
||||||
#elif defined(USE_ROUTE)
|
#elif defined(USE_ROUTE)
|
||||||
|
|
||||||
|
#ifdef RT_ROUNDUP
|
||||||
|
#define SAROUNDUP(X) RT_ROUNDUP(((struct sockaddr *)(X))->sa_len)
|
||||||
|
#else
|
||||||
#define ROUNDUP(a) \
|
#define ROUNDUP(a) \
|
||||||
((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
|
((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
|
||||||
|
|
||||||
#define SAROUNDUP(X) ROUNDUP(((struct sockaddr *)(X))->sa_len)
|
#define SAROUNDUP(X) ROUNDUP(((struct sockaddr *)(X))->sa_len)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
static size_t
|
static size_t
|
||||||
parse_address(caddr_t start, caddr_t end, struct sockaddr_storage *dest)
|
parse_address(caddr_t start, caddr_t end, struct sockaddr_storage *dest)
|
||||||
|
|
Loading…
Reference in New Issue