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

Fix "ipfw fwd" to work for incoming IPv4 packets when ip_tryforward() chooses

Browse Source 
fast forwarding path, as it already works for IPv6 and for both of them
on old slow path.

PR:			231143
Reviewed by:		ae
Approved by:		re (gjb)
MFC after:		1 week
Differential Revision:	https://reviews.freebsd.org/D17039
This commit is contained in:
eugen 2018-09-05 13:59:36 +00:00
parent 54f3f3f9dc
commit 3eb0af32cd
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/netinet/ip_fastfwd.c
View File

@ -153,7 +153,7 @@ ip_tryforward(struct mbuf *m)
struct mbuf *m0 = NULL; struct mbuf *m0 = NULL;
struct nhop4_basic nh; struct nhop4_basic nh;
struct sockaddr_in dst; struct sockaddr_in dst;
struct in_addr odest, dest; struct in_addr dest, odest, rtdest;
uint16_t ip_len, ip_off; uint16_t ip_len, ip_off;
int error = 0; int error = 0;
struct m_tag *fwd_tag = NULL; struct m_tag *fwd_tag = NULL;
@ -293,12 +293,31 @@ passin:
} }
#endif #endif
/*
* Next hop forced by pfil(9) hook?
*/
if ((m->m_flags & M_IP_NEXTHOP) &&
((fwd_tag = m_tag_find(m, PACKET_TAG_IPFORWARD, NULL)) != NULL)) {
/*
* Now we will find route to forced destination.
*/
dest.s_addr = ((struct sockaddr_in *)
(fwd_tag + 1))->sin_addr.s_addr;
m_tag_delete(m, fwd_tag);
m->m_flags &= ~M_IP_NEXTHOP;
}
/* /*
* Find route to destination. * Find route to destination.
*/ */
if (ip_findroute(&nh, dest, m) != 0) if (ip_findroute(&nh, dest, m) != 0)
return (NULL); /* icmp unreach already sent */ return (NULL); /* icmp unreach already sent */
/*
* Avoid second route lookup by caching destination.
*/
rtdest.s_addr = dest.s_addr;
/* /*
* Step 5: outgoing firewall packet processing * Step 5: outgoing firewall packet processing
*/ */
@ -321,6 +340,8 @@ passin:
*/ */
if (m->m_flags & M_IP_NEXTHOP) if (m->m_flags & M_IP_NEXTHOP)
fwd_tag = m_tag_find(m, PACKET_TAG_IPFORWARD, NULL); fwd_tag = m_tag_find(m, PACKET_TAG_IPFORWARD, NULL);
else
fwd_tag = NULL;
if (odest.s_addr != dest.s_addr || fwd_tag != NULL) { if (odest.s_addr != dest.s_addr || fwd_tag != NULL) {
/* /*
* Is it now for a local address on this host? * Is it now for a local address on this host?
@ -342,7 +363,8 @@ forwardlocal:
m_tag_delete(m, fwd_tag); m_tag_delete(m, fwd_tag);
m->m_flags &= ~M_IP_NEXTHOP; m->m_flags &= ~M_IP_NEXTHOP;
} }
if (ip_findroute(&nh, dest, m) != 0) if (dest.s_addr != rtdest.s_addr &&
ip_findroute(&nh, dest, m) != 0)
return (NULL); /* icmp unreach already sent */ return (NULL); /* icmp unreach already sent */
} }