expr: meta: add slave device matching

Cc: Martin Willi <martin@strongswan.org>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h
index bb9b049310dffbebbaf84113aaee5737bbf94190..e237ecbdcd8ac3740cfaa714fcb6e3a1f340a317 100644 (file)
--- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h
@@ -805,6 +805,8 @@ enum nft_exthdr_attributes {
  * @NFT_META_TIME_NS: time since epoch (in nanoseconds)
  * @NFT_META_TIME_DAY: day of week (from 0 = Sunday to 6 = Saturday)
  * @NFT_META_TIME_HOUR: hour of day (in seconds)
+ * @NFT_META_SDIF: slave device interface index
+ * @NFT_META_SDIFNAME: slave device interface name
  */
 enum nft_meta_keys {
        NFT_META_LEN,
@@ -840,6 +842,8 @@ enum nft_meta_keys {
        NFT_META_TIME_NS,
        NFT_META_TIME_DAY,
        NFT_META_TIME_HOUR,
+       NFT_META_SDIF,
+       NFT_META_SDIFNAME,
 };
 
 /**

diff --git a/src/expr/meta.c b/src/expr/meta.c
index 979019831f2b29a3835e70a01c3b2836831af3c4..6ed8ee5645c4b835275e21f1052d37bf2cae6237 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_TIME_HOUR + 1)
+#define NFT_META_MAX (NFT_META_SDIFNAME + 1)
 #endif
 
 struct nftnl_expr_meta {
@@ -166,6 +166,8 @@ static const char *meta_key2str_array[NFT_META_MAX] = {
        [NFT_META_TIME_NS]      = "time",
        [NFT_META_TIME_DAY]     = "day",
        [NFT_META_TIME_HOUR]    = "hour",
+       [NFT_META_SDIF]         = "sdif",
+       [NFT_META_SDIFNAME]     = "sdifname",
 };
 
 static const char *meta_key2str(uint8_t key)