diff options
| author |   denis <denis@openbsd.org> | 2020-11-07 09:53:21 +0000 |
|---|---|---|
| committer | denis <denis@openbsd.org> | 2020-11-07 09:53:21 +0000 |
| commit | 7b93fac008fd86ff32c5637b6e914432b70eab57 (patch) | |
| tree | b74ddfaf0e726701e6e4e0265f2b0caed412f352 | |
| parent | Rework source IP address setting. (diff) | |
| download | wireguard-openbsd-7b93fac008fd86ff32c5637b6e914432b70eab57.tar.xz wireguard-openbsd-7b93fac008fd86ff32c5637b6e914432b70eab57.zip | |
Since rework of source IP selection, we can reverse the last changes
| -rw-r--r-- | regress/sys/net/rtable/Makefile.inc | 6 | ||||
| -rw-r--r-- | regress/sys/net/rtable/kern_compat.h | 10 | ||||
| -rw-r--r-- | regress/sys/net/rtable/util.h | 5 |
3 files changed, 7 insertions, 14 deletions
diff --git a/regress/sys/net/rtable/Makefile.inc b/regress/sys/net/rtable/Makefile.inc index df2cbca2d27..6654bac2836 100644 --- a/regress/sys/net/rtable/Makefile.inc +++ b/regress/sys/net/rtable/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.6 2020/11/06 15:26:38 bluhm Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2020/11/07 09:53:21 denis Exp $ TOPDIR= ${.CURDIR}/.. @@ -9,8 +9,6 @@ SRCS+= art.c CFLAGS+= -DART .endif -CPPFLAGS+= -I${TOPDIR} -Wall \ - -D'satosin(sa)=((struct sockaddr_in *)(sa))' \ - -D'satosin6(sa)=((struct sockaddr_in6 *)(sa))' +CPPFLAGS+= -I${TOPDIR} -Wall .PATH: ${TOPDIR} ${TOPDIR}/../../../../sys/net diff --git a/regress/sys/net/rtable/kern_compat.h b/regress/sys/net/rtable/kern_compat.h index f8399ce3602..4b45761f667 100644 --- a/regress/sys/net/rtable/kern_compat.h +++ b/regress/sys/net/rtable/kern_compat.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_compat.h,v 1.10 2020/11/03 21:50:58 tb Exp $ */ +/* $OpenBSD: kern_compat.h,v 1.11 2020/11/07 09:53:21 denis Exp $ */ #ifndef _KERN_COMPAT_H_ #define _KERN_COMPAT_H_ @@ -82,12 +82,4 @@ struct rtentry; int rt_hash(struct rtentry *, struct sockaddr *, uint32_t *); -struct ifaddr; - -__unused static inline struct ifaddr * -ifa_ifwithaddr(struct sockaddr *addr, u_int rtableid) -{ - return NULL; -} - #endif /* _KERN_COMPAT_H_ */ diff --git a/regress/sys/net/rtable/util.h b/regress/sys/net/rtable/util.h index 0c234b611be..99529c0c5a0 100644 --- a/regress/sys/net/rtable/util.h +++ b/regress/sys/net/rtable/util.h @@ -1,4 +1,4 @@ -/* $OpenBSD: util.h,v 1.3 2020/11/06 15:26:38 bluhm Exp $ */ +/* $OpenBSD: util.h,v 1.4 2020/11/07 09:53:21 denis Exp $ */ /* * Copyright (c) 2015 Martin Pieuchot @@ -30,3 +30,6 @@ int maskcmp(sa_family_t, struct sockaddr *, struct sockaddr *); int inet_net_ptosa(sa_family_t, const char *, struct sockaddr *, struct sockaddr *); char *inet_net_satop(sa_family_t, struct sockaddr *, int, char *, size_t); + +#define satosin(sa) ((struct sockaddr_in *)(sa)) +#define satosin6(sa) ((struct sockaddr_in6 *)(sa)) |