]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
Merge r258708, r258711, r260247, r261117.
authormelifaro <melifaro@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Thu, 8 May 2014 19:11:41 +0000 (19:11 +0000)
committermelifaro <melifaro@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Thu, 8 May 2014 19:11:41 +0000 (19:11 +0000)
commit88203b1140961bf9dbf1c167717dd2fc5f4fde81
tree757fb0f228e9335e00a5a6d852a808bcee62a934
parent5ef25fe95c2d6d2f75a72fce87c1b8bd0ae28e5b
Merge r258708, r258711, r260247, r261117.

r258708:
Check ipfw table numbers in both user and kernel space before rule addition.
Found by:       Saychik Pavel <umka@localka.net>

r258711:
Simplify O_NAT opcode handling.

r260247:
Use rnh_matchaddr instead of rnh_lookup for longest-prefix match.
rnh_lookup is effectively the same as rnh_matchaddr if called with
empy network mask.

r261117:
Reorder struct ip_fw_chain:
* move rarely-used fields down
* move uh_lock to different cacheline
* remove some usused fields

git-svn-id: svn://svn.freebsd.org/base/stable/10@265700 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
sbin/ipfw/ipfw2.c
sbin/ipfw/ipfw2.h
sys/netpfil/ipfw/ip_fw2.c
sys/netpfil/ipfw/ip_fw_private.h
sys/netpfil/ipfw/ip_fw_sockopt.c
sys/netpfil/ipfw/ip_fw_table.c