libnetfilter_conntrack: support for IPS_OFFLOAD
Pablo Neira Ayuso
maintainerPATCH 1/1 libnetfilter_conntrack: support for IPS_OFFLOAD
Print [OFFLOAD] tag when listing entries via snprintf() interface.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- .../linux_nf_conntrack_common.h | 24 ++++++++++++++++++++-- src/conntrack/snprintf_default.c | 6 ++++-- 2 files changed, 26 insertions(+), 4 deletions(-)
include/libnetfilter_conntrack/linux_nf_conntrack_common.h +22 -2
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _NF_CONNTRACK_COMMON_H#define _NF_CONNTRACK_COMMON_H
@@ -33,12 +34,14 @@ enum ip_conntrack_info {/* only for userspace compatibility */ #ifndef __KERNEL__ IP_CT_NEW_REPLY = IP_CT_NUMBER, +#else + IP_CT_UNTRACKED = 7, #endif }; #define NF_CT_STATE_INVALID_BIT (1 << 0) #define NF_CT_STATE_BIT(ctinfo) (1 << ((ctinfo) % IP_CT_IS_REPLY + 1)) -#define NF_CT_STATE_UNTRACKED_BIT (1 << (IP_CT_NUMBER + 1)) +#define NF_CT_STATE_UNTRACKED_BIT (1 << 6) /* Bitset representing status of connection. */ enum ip_conntrack_status {
@@ -95,13 +98,26 @@ enum ip_conntrack_status {IPS_TEMPLATE_BIT =11 ,IPS_TEMPLATE = (1 <<IPS_TEMPLATE_BIT ), -/* Conntrack is a fake untracked entry */ +/* Conntrack is a fake untracked entry. Obsolete and not used anymore */ IPS_UNTRACKED_BIT =12 ,IPS_UNTRACKED = (1 <<IPS_UNTRACKED_BIT ),/* Conntrack got a helper explicitly attached via CT target. */ IPS_HELPER_BIT =13 ,IPS_HELPER = (1 <<IPS_HELPER_BIT ), + +/* Conntrack has been offloaded to flow table. */ +IPS_OFFLOAD_BIT =14 , +IPS_OFFLOAD = (1 <<IPS_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_MAX_BIT = 15, };/* Connection tracking event types */
@@ -118,6 +134,10 @@ enum ip_conntrack_events {IPCT_NATSEQADJ =IPCT_SEQADJ ,IPCT_SECMARK ,/* new security mark has been set */ IPCT_LABEL ,/* new connlabel has been set */ +IPCT_SYNPROXY ,/* synproxy has been set */ +#ifdef __KERNEL__ + __IPCT_MAX +#endif }; enum ip_conntrack_expect_events {
src/conntrack/snprintf_default.c +4 -2
@@ -183,8 +183,10 @@ static int __snprintf_status_assured(char *buf, const struct nf_conntrack *ct) {int size =0 ; - -if (ct->status &IPS_ASSURED ) + +if (ct->status &IPS_OFFLOAD ) + size =snprintf (buf, len,"[OFFLOAD] " ); +else if (ct->status &IPS_ASSURED ) size =snprintf (buf, len,"[ASSURED] " );return size;
Signature · 1 line
2.11.0