d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

if_wg: fix the !INET6 support

Browse Source 
INET is still required, so formally don't build it in !INET
configurations.
This commit is contained in:
Kyle Evans 2021-03-15 00:38:22 -05:00
parent e277a507d8
commit 1170485947
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/if_wg/if_wg.c
View File

@ -1102,11 +1102,13 @@ wg_send(struct wg_softc *sc, struct wg_endpoint *e, struct mbuf *m)
control = sbcreatecontrol((caddr_t)&e->e_local.l_in,
sizeof(struct in_addr), IP_SENDSRCADDR,
IPPROTO_IP);
#ifdef INET6
} else if (e->e_remote.r_sa.sa_family == AF_INET6) {
if (!IN6_IS_ADDR_UNSPECIFIED(&e->e_local.l_in6))
control = sbcreatecontrol((caddr_t)&e->e_local.l_pktinfo6,
sizeof(struct in6_pktinfo), IPV6_PKTINFO,
IPPROTO_IPV6);
#endif
} else {
m_freem(m);
return (EAFNOSUPPORT);
@ -2296,7 +2298,9 @@ wg_update_endpoint_addrs(struct wg_endpoint *e, const struct sockaddr *srcsa,
struct ifnet *rcvif)
{
const struct sockaddr_in *sa4;
#ifdef INET6
const struct sockaddr_in6 *sa6;
#endif
int ret = 0;
/*
@ -2307,10 +2311,12 @@ wg_update_endpoint_addrs(struct wg_endpoint *e, const struct sockaddr *srcsa,
sa4 = (const struct sockaddr_in *)srcsa;
e->e_remote.r_sin = sa4[0];
e->e_local.l_in = sa4[1].sin_addr;
#ifdef INET6
} else if (srcsa->sa_family == AF_INET6) {
sa6 = (const struct sockaddr_in6 *)srcsa;
e->e_remote.r_sin6 = sa6[0];
e->e_local.l_in6 = sa6[1].sin6_addr;
#endif
} else {
ret = EAFNOSUPPORT;
}

6
sys/modules/Makefile
View File

@ -163,7 +163,7 @@ SUBDIR= \
if_tuntap \
if_vlan \
if_vxlan \
if_wg \
${_if_wg} \
iflib \
${_iir} \
imgact_binmisc \
@ -456,6 +456,10 @@ _sctp= sctp
_if_stf= if_stf
.endif
.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
_if_wg= if_wg
.endif
.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
_if_me= if_me
_ipdivert= ipdivert