src: Add ct id support

The 'id' key returns the id of the connection entry

Signed-off-by: Brett Mastbergen <bmastbergen@untangle.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h
index 7eb8a5ba21db596533e81dcfb781f9a43bb3f3e4..38f74e428fd31d4f3e52abe09bfefca06e018f61 100644 (file)
--- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h
@@ -978,6 +978,7 @@ enum nft_osf_attributes {
  * @NFT_CT_SRC_IP6: conntrack layer 3 protocol source (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_ID: conntrack id
  */
 enum nft_ct_keys {
        NFT_CT_STATE,
@@ -1004,6 +1005,7 @@ enum nft_ct_keys {
        NFT_CT_SRC_IP6,
        NFT_CT_DST_IP6,
        NFT_CT_TIMEOUT,
+       NFT_CT_ID,
        __NFT_CT_MAX
 };
 #define NFT_CT_MAX             (__NFT_CT_MAX - 1)

diff --git a/src/expr/ct.c b/src/expr/ct.c
index b9ca2dc6910c655b76479333e294f852b5db6fd5..124de9dd2b33aee447bd9ba66a8ecac6dd9ff235 100644 (file)
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -172,6 +172,7 @@ static const char *ctkey2str_array[NFT_CT_MAX + 1] = {
        [NFT_CT_DST_IP]         = "dst_ip",
        [NFT_CT_SRC_IP6]        = "src_ip6",
        [NFT_CT_DST_IP6]        = "dst_ip6",
+       [NFT_CT_ID]             = "id",
 };
 
 static const char *ctkey2str(uint32_t ctkey)