]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
MFC r363284-r363285, r363452, r363670
authorCy Schubert <cy@FreeBSD.org>
Sun, 2 Aug 2020 04:25:11 +0000 (04:25 +0000)
committerCy Schubert <cy@FreeBSD.org>
Sun, 2 Aug 2020 04:25:11 +0000 (04:25 +0000)
commit308b0f6199e29d08314ef67a3b65e21fcc60e8c3
tree1d438a6c75de5f62bd3a6e3e702e1a99eda20c44
parentb62cd1096b96e3ee0181a8458de69ed93b1de33e
MFC r363284-r363285, r363452, r363670

r363284:
pfil_run_hooks() can be called recursively, so we have to
define FASTROUTE_RECURSION in fil.c

Submitted by: christos@NetBSD.org
Reported by: christos@NetBSD.org
Obtained from: NetBSD r1.31

r363285:
Fix incorrect byte order in ipfstat -f output.
- make sure frag is initialized to 0
- initialize ipfr_p field

NetBSD PR: 55137
Submitted by: christos@NetBSD.org
Reported by: christos@NetBSD.org
Obtained from: NetBSD fil.c r1.32, ip_frag.c r1.8

r363452:
Load ipfilter, ipnat, and ippool rules, and start ipmon in a vnet jail.

PR: 248109
Reported by: joeb1@a1poweruser.com

r363670:
Continued ipfilter #ifdef cleanup. The r343701 log entry contains a
complete description.
13 files changed:
contrib/ipfilter/iplang/iplang_y.y
contrib/ipfilter/ipsend/arp.c
contrib/ipfilter/ipsend/ipresend.c
contrib/ipfilter/ipsend/ipsend.c
contrib/ipfilter/ipsend/iptest.c
contrib/ipfilter/ipsend/iptests.c
contrib/ipfilter/ipsend/sock.c
libexec/rc/rc.d/ipfilter
libexec/rc/rc.d/ipmon
libexec/rc/rc.d/ipnat
libexec/rc/rc.d/ippool
sys/contrib/ipfilter/netinet/fil.c
sys/contrib/ipfilter/netinet/ip_frag.c