include: resync nf_tables.h cache copy

Sync this with the kernel header file we currently have in tree.

This patch addresses the compilation warning and breakage as result of
this header update, specifically the "attibute" typo in trace and
missing default case in expr/numgen.c.

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 0b11abf5b251d38af7ef6ad1be63bca7b8ec7534..8a63f22b365d54ea00397cabe3e24c86f7ce1bf4 100644 (file)
--- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h
@@ -666,33 +666,6 @@ enum nft_exthdr_attributes {
 };
 #define NFTA_EXTHDR_MAX                (__NFTA_EXTHDR_MAX - 1)
 
-/**
- * enum nft_ng_attributes - nf_tables number generator expression attributes
- *
- * @NFTA_NG_DREG: destination register (NLA_U32)
- * @NFTA_NG_UNTIL: limit value (NLA_U32)
- * @NFTA_NG_TYPE: type of operation (NLA_U32)
- */
-enum nft_ng_attributes {
-       NFTA_NG_UNSPEC,
-       NFTA_NG_DREG,
-       NFTA_NG_UNTIL,
-       NFTA_NG_TYPE,
-       __NFTA_NG_MAX
-};
-#define NFTA_NG_MAX            (__NFTA_NG_MAX - 1)
-
-/**
- * enum nft_ng_type - nf_tables number generator expression reject types
- *
- * @NFT_NG_INCREMENTAL: Incremental number generator
- * @NFT_NG_RANDOM: Random number generator
- */
-enum nft_ng_type {
-       NFT_NG_INCREMENTAL,
-       NFT_NG_RANDOM
-};
-
 /**
  * enum nft_meta_keys - nf_tables meta expression keys
  *
@@ -750,6 +723,26 @@ enum nft_meta_keys {
        NFT_META_PRANDOM,
 };
 
+/**
+ * enum nft_hash_attributes - nf_tables hash expression netlink attributes
+ *
+ * @NFTA_HASH_SREG: source register (NLA_U32)
+ * @NFTA_HASH_DREG: destination register (NLA_U32)
+ * @NFTA_HASH_LEN: source data length (NLA_U32)
+ * @NFTA_HASH_MODULUS: modulus value (NLA_U32)
+ * @NFTA_HASH_SEED: seed value (NLA_U32)
+ */
+enum nft_hash_attributes {
+       NFTA_HASH_UNSPEC,
+       NFTA_HASH_SREG,
+       NFTA_HASH_DREG,
+       NFTA_HASH_LEN,
+       NFTA_HASH_MODULUS,
+       NFTA_HASH_SEED,
+       __NFTA_HASH_MAX,
+};
+#define NFTA_HASH_MAX  (__NFTA_HASH_MAX - 1)
+
 /**
  * enum nft_meta_attributes - nf_tables meta expression netlink attributes
  *
@@ -908,7 +901,7 @@ enum nft_queue_attributes {
 #define NFT_QUEUE_FLAG_MASK            0x03
 
 enum nft_quota_flags {
-       NFT_QUOTA_F_INV = (1 << 0),
+       NFT_QUOTA_F_INV         = (1 << 0),
 };
 
 /**
@@ -1097,7 +1090,7 @@ enum nft_gen_attributes {
  * @NFTA_TRACE_NFPROTO: nf protocol processed (NLA_U32)
  * @NFTA_TRACE_POLICY: policy that decided fate of packet (NLA_U32)
  */
-enum nft_trace_attibutes {
+enum nft_trace_attributes {
        NFTA_TRACE_UNSPEC,
        NFTA_TRACE_TABLE,
        NFTA_TRACE_CHAIN,
@@ -1130,23 +1123,26 @@ enum nft_trace_types {
 #define NFT_TRACETYPE_MAX (__NFT_TRACETYPE_MAX - 1)
 
 /**
- * enum nft_hash_attributes - nf_tables hash expression attributes
+ * enum nft_ng_attributes - nf_tables number generator expression netlink attributes
  *
- * @NFTA_HASH_SREG: source register (NLA_U32)
- * @NFTA_HASH_DREG: destination register (NLA_U32)
- * @NFTA_HASH_LEN: data length (NLA_U32)
- * @NFTA_HASH_MODULUS: Modulus value (NLA_U32)
- * @NFTA_HASH_SEED: hash initial value (NLA_U32)
+ * @NFTA_NG_DREG: destination register (NLA_U32)
+ * @NFTA_NG_UNTIL: source value to increment the counter until reset (NLA_U32)
+ * @NFTA_NG_TYPE: operation type (NLA_U32)
  */
-enum nft_hash_attributes {
-       NFTA_HASH_UNSPEC,
-       NFTA_HASH_SREG,
-       NFTA_HASH_DREG,
-       NFTA_HASH_LEN,
-       NFTA_HASH_MODULUS,
-       NFTA_HASH_SEED,
-       __NFTA_HASH_MAX
+enum nft_ng_attributes {
+       NFTA_NG_UNSPEC,
+       NFTA_NG_DREG,
+       NFTA_NG_UNTIL,
+       NFTA_NG_TYPE,
+       __NFTA_NG_MAX
+};
+#define NFTA_NG_MAX    (__NFTA_NG_MAX - 1)
+
+enum nft_ng_types {
+       NFT_NG_INCREMENTAL,
+       NFT_NG_RANDOM,
+       __NFT_NG_MAX
 };
-#define NFTA_HASH_MAX          (__NFTA_HASH_MAX - 1)
+#define NFT_NG_MAX     (__NFT_NG_MAX - 1)
 
 #endif /* _LINUX_NF_TABLES_H */

diff --git a/src/expr/numgen.c b/src/expr/numgen.c
index 0669eda921c76427f39ea7f7cd7c35eefc8bcaac..7f2b425dca7ce4fdeafce36dead5232d2490c20d 100644 (file)
--- a/src/expr/numgen.c
+++ b/src/expr/numgen.c
@@ -23,7 +23,7 @@
 struct nftnl_expr_ng {
        enum nft_registers      dreg;
        unsigned int            until;
-       enum nft_ng_type        type;
+       enum nft_ng_types       type;
 };
 
 static int
@@ -200,6 +200,8 @@ nftnl_expr_ng_snprintf_default(char *buf, size_t size,
                               ng->until);
                SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
                break;
+       default:
+               break;
        }
 
        return offset;

diff --git a/src/trace.c b/src/trace.c
index 1a503901fe5902148f85db0c6f55e75d044b8134..2b3388d985a12c914bb4678711b2a98d0ab7c284 100644 (file)
--- a/src/trace.c
+++ b/src/trace.c
@@ -79,7 +79,7 @@ bool nftnl_trace_is_set(const struct nftnl_trace *t, uint16_t attr)
 static int nftnl_trace_parse_attr_cb(const struct nlattr *attr, void *data)
 {
        const struct nlattr **tb = data;
-       enum nft_trace_attibutes type = mnl_attr_get_type(attr);
+       enum nft_trace_attributes type = mnl_attr_get_type(attr);
 
        if (mnl_attr_type_valid(attr, NFTA_TRACE_MAX) < 0)
                return MNL_CB_OK;