include: refresh nf_tables.h cached copy

Refresh it to fetch what we have in 4.15-rc.

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 f32894431f8230b4c53c7f8ada87ff0531c42b7c..a3ee277b17a17885f27c73e8d0f66dc8117817aa 100644 (file)
--- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h
@@ -1,10 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_NF_TABLES_H
 #define _LINUX_NF_TABLES_H
 
-#define NFT_TABLE_MAXNAMELEN   32
-#define NFT_CHAIN_MAXNAMELEN   32
-#define NFT_SET_MAXNAMELEN     32
-#define NFT_OBJ_MAXNAMELEN     32
+#define NFT_NAME_MAXLEN                256
+#define NFT_TABLE_MAXNAMELEN   NFT_NAME_MAXLEN
+#define NFT_CHAIN_MAXNAMELEN   NFT_NAME_MAXLEN
+#define NFT_SET_MAXNAMELEN     NFT_NAME_MAXLEN
+#define NFT_OBJ_MAXNAMELEN     NFT_NAME_MAXLEN
 #define NFT_USERDATA_MAXLEN    256
 
 /**
@@ -731,7 +733,8 @@ enum nft_exthdr_op {
  * @NFTA_EXTHDR_OFFSET: extension header offset (NLA_U32)
  * @NFTA_EXTHDR_LEN: extension header length (NLA_U32)
  * @NFTA_EXTHDR_FLAGS: extension header flags (NLA_U32)
- * @NFTA_EXTHDR_OP: option match type (NLA_U8)
+ * @NFTA_EXTHDR_OP: option match type (NLA_U32)
+ * @NFTA_EXTHDR_SREG: option match type (NLA_U32)
  */
 enum nft_exthdr_attributes {
        NFTA_EXTHDR_UNSPEC,
@@ -741,6 +744,7 @@ enum nft_exthdr_attributes {
        NFTA_EXTHDR_LEN,
        NFTA_EXTHDR_FLAGS,
        NFTA_EXTHDR_OP,
+       NFTA_EXTHDR_SREG,
        __NFTA_EXTHDR_MAX
 };
 #define NFTA_EXTHDR_MAX                (__NFTA_EXTHDR_MAX - 1)
@@ -808,6 +812,7 @@ enum nft_meta_keys {
  * @NFT_RT_CLASSID: realm value of packet's route (skb->dst->tclassid)
  * @NFT_RT_NEXTHOP4: routing nexthop for IPv4
  * @NFT_RT_NEXTHOP6: routing nexthop for IPv6
+ * @NFT_RT_TCPMSS: fetch current path tcp mss
  */
 enum nft_rt_keys {
        NFT_RT_CLASSID,
@@ -1222,7 +1227,7 @@ enum nft_objref_attributes {
 enum nft_gen_attributes {
        NFTA_GEN_UNSPEC,
        NFTA_GEN_ID,
-       NFTA_GEN_PROC_ID,
+       NFTA_GEN_PROC_PID,
        NFTA_GEN_PROC_NAME,
        __NFTA_GEN_MAX
 };

diff --git a/src/netlink.c b/src/netlink.c
index 8653ae6e70c76c90dd64d9a1374cb7f82e0f3522..9677ffc0366808f016ee48c8e84f633212440e4b 100644 (file)
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -2918,7 +2918,7 @@ static int netlink_events_newgen_cb(const struct nlmsghdr *nlh, int type,
                                break;
                        strncpy(name, mnl_attr_get_str(attr), sizeof(name));
                        break;
-               case NFTA_GEN_PROC_ID:
+               case NFTA_GEN_PROC_PID:
                        if (mnl_attr_validate(attr, MNL_TYPE_U32) < 0)
                                break;
                        pid = ntohl(mnl_attr_get_u32(attr));