expr: meta: Make NFT_META_{I,O}IFKIND known

This only affects debug output, the key was properly handled in
productive code paths already.

Signed-off-by: Phil Sutter <phil@nwl.cc>
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 4777331ddfa6f13776b21d48c6b0b024e6745380..1bf4346c527801fa9969731d7cae5ddb4b723a36 100644 (file)
--- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h
@@ -792,6 +792,8 @@ enum nft_exthdr_attributes {
  * @NFT_META_CGROUP: socket control group (skb->sk->sk_classid)
  * @NFT_META_PRANDOM: a 32bit pseudo-random number
  * @NFT_META_SECPATH: boolean, secpath_exists (!!skb->sp)
+ * @NFT_META_IIFKIND: packet input interface kind name (dev->rtnl_link_ops->kind)
+ * @NFT_META_OIFKIND: packet output interface kind name (dev->rtnl_link_ops->kind)
  */
 enum nft_meta_keys {
        NFT_META_LEN,
@@ -820,6 +822,8 @@ enum nft_meta_keys {
        NFT_META_CGROUP,
        NFT_META_PRANDOM,
        NFT_META_SECPATH,
+       NFT_META_IIFKIND,
+       NFT_META_OIFKIND,
 };
 
 /**

diff --git a/src/expr/meta.c b/src/expr/meta.c
index ffcc8967b109db19b79dbc77b39c0c164723ba89..f1984f6eb5c5b09c6f209aade90af391b973fcee 100644 (file)
--- a/src/expr/meta.c
+++ b/src/expr/meta.c
@@ -22,7 +22,7 @@
 #include <libnftnl/rule.h>
 
 #ifndef NFT_META_MAX
-#define NFT_META_MAX (NFT_META_SECPATH + 1)
+#define NFT_META_MAX (NFT_META_OIFKIND + 1)
 #endif
 
 struct nftnl_expr_meta {
@@ -159,6 +159,8 @@ static const char *meta_key2str_array[NFT_META_MAX] = {
        [NFT_META_CGROUP]       = "cgroup",
        [NFT_META_PRANDOM]      = "prandom",
        [NFT_META_SECPATH]      = "secpath",
+       [NFT_META_IIFKIND]      = "iifkind",
+       [NFT_META_OIFKIND]      = "oifkind",
 };
 
 static const char *meta_key2str(uint8_t key)