conntrack: add support for the IPS_HW_OFFLOAD flag
Pablo Neira Ayuso
maintainerPATCH 1/1 conntrack: add support for the IPS_HW_OFFLOAD flag
This patch adds support for the IPS_HW_OFFLOAD flag which specifies that this conntrack entry has been offloaded into the hardware.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/linux/netfilter/nf_conntrack_common.h | 18 ++++++++++++++++-- src/conntrack.c | 4 ++-- 2 files changed, 18 insertions(+), 4 deletions(-)
include/linux/netfilter/nf_conntrack_common.h +16 -2
@@ -97,6 +97,15 @@ enum ip_conntrack_status {IPS_UNTRACKED_BIT =12 ,IPS_UNTRACKED = (1 <<IPS_UNTRACKED_BIT ), +#ifdef __KERNEL__ +/* Re-purposed for in-kernel use: +* Tags a conntrack entry that clashed with an existing entry +* on insert. +*/ +IPS_NAT_CLASH_BIT =IPS_UNTRACKED_BIT , +IPS_NAT_CLASH =IPS_UNTRACKED , +#endif +/* Conntrack got a helper explicitly attached via CT target. */ IPS_HELPER_BIT =13 , IPS_HELPER = (1 << IPS_HELPER_BIT),
@@ -105,14 +114,19 @@ enum ip_conntrack_status {IPS_OFFLOAD_BIT =14 ,IPS_OFFLOAD = (1 <<IPS_OFFLOAD_BIT ), +/* Conntrack has been offloaded to hardware. */ +IPS_HW_OFFLOAD_BIT =15 , +IPS_HW_OFFLOAD = (1 <<IPS_HW_OFFLOAD_BIT ), +/* Be careful here, modifying these bits can make things messy, * so don't let users modify them directly. */ IPS_UNCHANGEABLE_MASK = (IPS_NAT_DONE_MASK |IPS_NAT_MASK |IPS_EXPECTED |IPS_CONFIRMED |IPS_DYING | -IPS_SEQ_ADJUST |IPS_TEMPLATE |IPS_OFFLOAD ), +IPS_SEQ_ADJUST |IPS_TEMPLATE |IPS_UNTRACKED | +IPS_OFFLOAD |IPS_HW_OFFLOAD ), - __IPS_MAX_BIT = 15, + __IPS_MAX_BIT = 16, };/* Connection tracking event types */
src/conntrack.c +2 -2
@@ -870,8 +870,8 @@ static struct parse_parameter {size_t size;unsigned int value[8 ]; } parse_array[PARSE_MAX] = { - { {"ASSURED", "SEEN_REPLY", "UNSET", "FIXED_TIMEOUT", "EXPECTED", "OFFLOAD"}, 6, - { IPS_ASSURED, IPS_SEEN_REPLY, 0, IPS_FIXED_TIMEOUT, IPS_EXPECTED, IPS_OFFLOAD} }, + { {"ASSURED", "SEEN_REPLY", "UNSET", "FIXED_TIMEOUT", "EXPECTED", "OFFLOAD", "HW_OFFLOAD"}, 7, + { IPS_ASSURED, IPS_SEEN_REPLY, 0, IPS_FIXED_TIMEOUT, IPS_EXPECTED, IPS_OFFLOAD, IPS_HW_OFFLOAD} }, { {"ALL", "NEW", "UPDATES", "DESTROY"}, 4, { CT_EVENT_F_ALL, CT_EVENT_F_NEW, CT_EVENT_F_UPD, CT_EVENT_F_DEL } }, { {"xml", "extended", "timestamp", "id", "ktimestamp", "labels", "userspace" }, 7,
Signature · 1 line
2.20.1