OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netfilter: nft_ct: Add ct id support 

The 'id' key returns the unique id of the conntrack entry as returned
by nf_ct_get_id().

Signed-off-by: Brett Mastbergen <bmastbergen@untangle.com>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Brett Mastbergen 2019-04-24 10:48:44 -04:00 committed by Pablo Neira Ayuso
parent fec9c271b8
commit 3087c3f7c2
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/uapi/linux/netfilter/nf_tables.h
View File

@ -967,6 +967,7 @@ enum nft_socket_keys {
* @NFT_CT_SRC_IP6: conntrack layer 3 protocol source (IPv6 address) * @NFT_CT_SRC_IP6: conntrack layer 3 protocol source (IPv6 address)
* @NFT_CT_DST_IP6: conntrack layer 3 protocol destination (IPv6 address) * @NFT_CT_DST_IP6: conntrack layer 3 protocol destination (IPv6 address)
* @NFT_CT_TIMEOUT: connection tracking timeout policy assigned to conntrack * @NFT_CT_TIMEOUT: connection tracking timeout policy assigned to conntrack
* @NFT_CT_ID: conntrack id
*/ */
enum nft_ct_keys { enum nft_ct_keys {
NFT_CT_STATE, NFT_CT_STATE,
@ -993,6 +994,7 @@ enum nft_ct_keys {
NFT_CT_SRC_IP6, NFT_CT_SRC_IP6,
NFT_CT_DST_IP6, NFT_CT_DST_IP6,
NFT_CT_TIMEOUT, NFT_CT_TIMEOUT,
NFT_CT_ID,
__NFT_CT_MAX __NFT_CT_MAX
}; };
#define NFT_CT_MAX (__NFT_CT_MAX - 1) #define NFT_CT_MAX (__NFT_CT_MAX - 1)

8
net/netfilter/nft_ct.c
View File

@ -178,6 +178,11 @@ static void nft_ct_get_eval(const struct nft_expr *expr,
return; return;
} }
#endif #endif
case NFT_CT_ID:
if (!nf_ct_is_confirmed(ct))
goto err;
*dest = nf_ct_get_id(ct);
return;
default: default:
break; break;
} }
@ -479,6 +484,9 @@ static int nft_ct_get_init(const struct nft_ctx *ctx,
len = sizeof(u16); len = sizeof(u16);
break; break;
#endif #endif
case NFT_CT_ID:
len = sizeof(u32);
break;
default: default:
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }