diff options
author | melifaro <melifaro@FreeBSD.org> | 2014-05-08 19:11:41 +0000 |
---|---|---|
committer | melifaro <melifaro@FreeBSD.org> | 2014-05-08 19:11:41 +0000 |
commit | 89bf7e80ea7ce88fd4bbd25c5f6576c40dea5acd (patch) | |
tree | 757fb0f228e9335e00a5a6d852a808bcee62a934 /sbin/ipfw/ipfw2.h | |
parent | 768038fadc43d4f5ab1e0d53d353bb7f5a892321 (diff) | |
download | FreeBSD-src-89bf7e80ea7ce88fd4bbd25c5f6576c40dea5acd.zip FreeBSD-src-89bf7e80ea7ce88fd4bbd25c5f6576c40dea5acd.tar.gz |
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
Diffstat (limited to 'sbin/ipfw/ipfw2.h')
-rw-r--r-- | sbin/ipfw/ipfw2.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sbin/ipfw/ipfw2.h b/sbin/ipfw/ipfw2.h index 9abe6ee..6e895b8 100644 --- a/sbin/ipfw/ipfw2.h +++ b/sbin/ipfw/ipfw2.h @@ -228,6 +228,8 @@ char const *match_value(struct _s_x *p, int value); int do_cmd(int optname, void *optval, uintptr_t optlen); +uint32_t ipfw_get_tables_max(void); + struct in6_addr; void n2mask(struct in6_addr *mask, int n); int contigmask(uint8_t *p, int len); |