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

Fix ipfw fwd that doesn't work in some cases

Browse Source 
For IPv4 use dst pointer as destination address in fib4_lookup().
It keeps destination address from IPv4 header and can be changed
when PACKET_TAG_IPFORWARD tag was set by packet filter.

For IPv6 override destination address with address from dst_sa.sin6_addr,
that was set from PACKET_TAG_IPFORWARD tag.

Reviewed by:	eugen
MFC after:	1 week
PR:		256828, 261697, 255705
Differential Revision: https://reviews.freebsd.org/D34732
This commit is contained in:
Andrey V. Elsukov 2022-04-01 16:49:25 +03:00
parent 4763c0aa68
commit 7d98cc096b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/netinet/ip_output.c
View File

@ -513,7 +513,7 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
} else {
struct nhop_object *nh;
nh = fib4_lookup(M_GETFIB(m), ip->ip_dst, 0, NHR_NONE,
nh = fib4_lookup(M_GETFIB(m), dst->sin_addr, 0, NHR_NONE,
m->m_pkthdr.flowid);
if (nh == NULL) {
#if defined(IPSEC) || defined(IPSEC_SUPPORT)

2
sys/netinet6/ip6_output.c
View File

@ -772,6 +772,8 @@ ip6_output(struct mbuf *m0, struct ip6_pktopts *opt,
ia = ifatoia6(nh->nh_ifa);
if (nh->nh_flags & NHF_GATEWAY)
dst->sin6_addr = nh->gw6_sa.sin6_addr;
else if (fwd_tag != NULL)
dst->sin6_addr = dst_sa.sin6_addr;
nonh6lookup:
;
}