History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

Pablo Neira Ayuso says: ==================== Netfilter updates for net-next The following patchset contains the first batch of Netfilter updates for the upcoming 4.5 kernel. This batch contains userspace netfilter header compilation fixes, support for packet mangling in nf_tables, the new tracing infrastructure for nf_tables and cgroup2 support for iptables. More specifically, they are: 1) Two patches to include dependencies in our netfilter userspace headers to resolve compilation problems, from Mikko Rapeli. 2) Four comestic cleanup patches for the ebtables codebase, from Ian Morris. 3) Remove duplicate include in the netfilter reject infrastructure, from Stephen Hemminger. 4) Two patches to simplify the netfilter defragmentation code for IPv6, patch from Florian Westphal. 5) Fix root ownership of /proc/net netfilter for unpriviledged net namespaces, from Philip Whineray. 6) Get rid of unused fields in struct nft_pktinfo, from Florian Westphal. 7) Add mangling support to our nf_tables payload expression, from Patrick McHardy. 8) Introduce a new netlink-based tracing infrastructure for nf_tables, from Florian Westphal. 9) Change setter functions in nfnetlink_log to be void, from Rami Rosen. 10) Add netns support to the cttimeout infrastructure. 11) Add cgroup2 support to iptables, from Tejun Heo. 12) Introduce nfnl_dereference_protected() in nfnetlink, from Florian. 13) Add support for mangling pkttype in the nf_tables meta expression, also from Florian. BTW, I need that you pull net into net-next, I have another batch that requires changes that I don't yet see in net. ====================

David S. Miller committed 10 years ago

Commit 59ce9672 parents 4b402d7 b4aae7566 files · +1062 −342Browse files

Showing the changes to include/uapi (31 of 66 files). Show all

Unified · Split

31 files
  1. include/uapi/linux/netfilter/ipset/ip_set_bitmap.h +2 −0
  2. include/uapi/linux/netfilter/ipset/ip_set_hash.h +2 −0
  3. include/uapi/linux/netfilter/ipset/ip_set_list.h +2 −0
  4. include/uapi/linux/netfilter/nf_conntrack_sctp.h +3 −9
  5. include/uapi/linux/netfilter/nf_conntrack_tuple_common.h +3 −0
  6. include/uapi/linux/netfilter/nf_tables.h +69 −0
  7. include/uapi/linux/netfilter/nfnetlink.h +2 −0
  8. include/uapi/linux/netfilter/xt_HMARK.h +1 −0
  9. include/uapi/linux/netfilter/xt_RATEEST.h +1 −0
  10. include/uapi/linux/netfilter/xt_TEE.h +2 −0
  11. include/uapi/linux/netfilter/xt_TPROXY.h +1 −0
  12. include/uapi/linux/netfilter/xt_cgroup.h +14 −1
  13. include/uapi/linux/netfilter/xt_hashlimit.h +1 −0
  14. include/uapi/linux/netfilter/xt_ipvs.h +1 −0
  15. include/uapi/linux/netfilter/xt_mac.h +2 −0
  16. include/uapi/linux/netfilter/xt_osf.h +2 −0
  17. include/uapi/linux/netfilter/xt_physdev.h +1 −1
  18. include/uapi/linux/netfilter/xt_policy.h +2 −0
  19. include/uapi/linux/netfilter/xt_rateest.h +1 −0
  20. include/uapi/linux/netfilter/xt_recent.h +1 −0
  21. include/uapi/linux/netfilter/xt_sctp.h +6 −6
  22. include/uapi/linux/netfilter_arp/arp_tables.h +1 −0
  23. include/uapi/linux/netfilter_bridge.h +1 −0
  24. include/uapi/linux/netfilter_bridge/ebt_arp.h +1 −0
  25. include/uapi/linux/netfilter_bridge/ebt_arpreply.h +2 −0
  26. include/uapi/linux/netfilter_bridge/ebt_ip6.h +1 −0
  27. include/uapi/linux/netfilter_bridge/ebt_nat.h +2 −0
  28. include/uapi/linux/netfilter_bridge/ebtables.h +4 −2
  29. include/uapi/linux/netfilter_ipv4/ip_tables.h +1 −0
  30. include/uapi/linux/netfilter_ipv6/ip6_tables.h +1 −0
  31. include/uapi/linux/netfilter_ipv6/ip6t_rt.h +1 −1
include/uapi/linux/netfilter/ipset/ip_set_bitmap.h+2−0
@@ -1,6 +1,8 @@
1#ifndef _UAPI__IP_SET_BITMAP_H1#ifndef _UAPI__IP_SET_BITMAP_H
2#define _UAPI__IP_SET_BITMAP_H2#define _UAPI__IP_SET_BITMAP_H
3 3
4#include <linux/netfilter/ipset/ip_set.h>
5
4/* Bitmap type specific error codes */6/* Bitmap type specific error codes */
5enum {7enum {
6 /* The element is out of the range of the set */8 /* The element is out of the range of the set */
include/uapi/linux/netfilter/ipset/ip_set_hash.h+2−0
@@ -1,6 +1,8 @@
1#ifndef _UAPI__IP_SET_HASH_H1#ifndef _UAPI__IP_SET_HASH_H
2#define _UAPI__IP_SET_HASH_H2#define _UAPI__IP_SET_HASH_H
3 3
4#include <linux/netfilter/ipset/ip_set.h>
5
4/* Hash type specific error codes */6/* Hash type specific error codes */
5enum {7enum {
6 /* Hash is full */8 /* Hash is full */
include/uapi/linux/netfilter/ipset/ip_set_list.h+2−0
@@ -1,6 +1,8 @@
1#ifndef _UAPI__IP_SET_LIST_H1#ifndef _UAPI__IP_SET_LIST_H
2#define _UAPI__IP_SET_LIST_H2#define _UAPI__IP_SET_LIST_H
3 3
4#include <linux/netfilter/ipset/ip_set.h>
5
4/* List type specific error codes */6/* List type specific error codes */
5enum {7enum {
6 /* Set name to be added/deleted/tested does not exist. */8 /* Set name to be added/deleted/tested does not exist. */
include/uapi/linux/netfilter/nf_conntrack_sctp.h+3−9
@@ -1,5 +1,5 @@
1#ifndef _NF_CONNTRACK_SCTP_H1#ifndef _UAPI_NF_CONNTRACK_SCTP_H
2#define _NF_CONNTRACK_SCTP_H2#define _UAPI_NF_CONNTRACK_SCTP_H
3/* SCTP tracking. */3/* SCTP tracking. */
4 4
5#include <linux/netfilter/nf_conntrack_tuple_common.h>5#include <linux/netfilter/nf_conntrack_tuple_common.h>
@@ -18,10 +18,4 @@ enum sctp_conntrack { · 12 unmodified lines
18 SCTP_CONNTRACK_MAX18 SCTP_CONNTRACK_MAX
19};19};
20 20
21struct ip_ct_sctp {21#endif /* _UAPI_NF_CONNTRACK_SCTP_H */
22 enum sctp_conntrack state;
23
24 __be32 vtag[IP_CT_DIR_MAX];
25};
26
27#endif /* _NF_CONNTRACK_SCTP_H */
include/uapi/linux/netfilter/nf_conntrack_tuple_common.h+3−0
@@ -1,6 +1,9 @@
1#ifndef _NF_CONNTRACK_TUPLE_COMMON_H1#ifndef _NF_CONNTRACK_TUPLE_COMMON_H
2#define _NF_CONNTRACK_TUPLE_COMMON_H2#define _NF_CONNTRACK_TUPLE_COMMON_H
3 3
4#include <linux/types.h>
5#include <linux/netfilter.h>
6
4enum ip_conntrack_dir {7enum ip_conntrack_dir {
5 IP_CT_DIR_ORIGINAL,8 IP_CT_DIR_ORIGINAL,
6 IP_CT_DIR_REPLY,9 IP_CT_DIR_REPLY,
include/uapi/linux/netfilter/nf_tables.h+69−0
@@ -83,6 +83,7 @@ enum nft_verdicts { · 82 unmodified lines
83 * @NFT_MSG_DELSETELEM: delete a set element (enum nft_set_elem_attributes)83 * @NFT_MSG_DELSETELEM: delete a set element (enum nft_set_elem_attributes)
84 * @NFT_MSG_NEWGEN: announce a new generation, only for events (enum nft_gen_attributes)84 * @NFT_MSG_NEWGEN: announce a new generation, only for events (enum nft_gen_attributes)
85 * @NFT_MSG_GETGEN: get the rule-set generation (enum nft_gen_attributes)85 * @NFT_MSG_GETGEN: get the rule-set generation (enum nft_gen_attributes)
86 * @NFT_MSG_TRACE: trace event (enum nft_trace_attributes)
86 */87 */
87enum nf_tables_msg_types {88enum nf_tables_msg_types {
88 NFT_MSG_NEWTABLE,89 NFT_MSG_NEWTABLE,
@@ -102,6 +103,7 @@ enum nf_tables_msg_types { · 13 unmodified lines
102 NFT_MSG_DELSETELEM,103 NFT_MSG_DELSETELEM,
103 NFT_MSG_NEWGEN,104 NFT_MSG_NEWGEN,
104 NFT_MSG_GETGEN,105 NFT_MSG_GETGEN,
106 NFT_MSG_TRACE,
105 NFT_MSG_MAX,107 NFT_MSG_MAX,
106};108};
107 109
@@ -597,6 +599,17 @@ enum nft_payload_bases { · 489 unmodified lines
597 NFT_PAYLOAD_TRANSPORT_HEADER,599 NFT_PAYLOAD_TRANSPORT_HEADER,
598};600};
599 601
602/**
603 * enum nft_payload_csum_types - nf_tables payload expression checksum types
604 *
605 * @NFT_PAYLOAD_CSUM_NONE: no checksumming
606 * @NFT_PAYLOAD_CSUM_INET: internet checksum (RFC 791)
607 */
608enum nft_payload_csum_types {
609 NFT_PAYLOAD_CSUM_NONE,
610 NFT_PAYLOAD_CSUM_INET,
611};
612
600/**613/**
601 * enum nft_payload_attributes - nf_tables payload expression netlink attributes614 * enum nft_payload_attributes - nf_tables payload expression netlink attributes
602 *615 *
@@ -604,6 +617,9 @@ enum nft_payload_bases { · 1 unmodified line
604 * @NFTA_PAYLOAD_BASE: payload base (NLA_U32: nft_payload_bases)617 * @NFTA_PAYLOAD_BASE: payload base (NLA_U32: nft_payload_bases)
605 * @NFTA_PAYLOAD_OFFSET: payload offset relative to base (NLA_U32)618 * @NFTA_PAYLOAD_OFFSET: payload offset relative to base (NLA_U32)
606 * @NFTA_PAYLOAD_LEN: payload length (NLA_U32)619 * @NFTA_PAYLOAD_LEN: payload length (NLA_U32)
620 * @NFTA_PAYLOAD_SREG: source register to load data from (NLA_U32: nft_registers)
621 * @NFTA_PAYLOAD_CSUM_TYPE: checksum type (NLA_U32)
622 * @NFTA_PAYLOAD_CSUM_OFFSET: checksum offset relative to base (NLA_U32)
607 */623 */
608enum nft_payload_attributes {624enum nft_payload_attributes {
609 NFTA_PAYLOAD_UNSPEC,625 NFTA_PAYLOAD_UNSPEC,
@@ -611,6 +627,9 @@ enum nft_payload_attributes { · 1 unmodified line
611 NFTA_PAYLOAD_BASE,627 NFTA_PAYLOAD_BASE,
612 NFTA_PAYLOAD_OFFSET,628 NFTA_PAYLOAD_OFFSET,
613 NFTA_PAYLOAD_LEN,629 NFTA_PAYLOAD_LEN,
630 NFTA_PAYLOAD_SREG,
631 NFTA_PAYLOAD_CSUM_TYPE,
632 NFTA_PAYLOAD_CSUM_OFFSET,
614 __NFTA_PAYLOAD_MAX633 __NFTA_PAYLOAD_MAX
615};634};
616#define NFTA_PAYLOAD_MAX (__NFTA_PAYLOAD_MAX - 1)635#define NFTA_PAYLOAD_MAX (__NFTA_PAYLOAD_MAX - 1)
@@ -970,4 +989,54 @@ enum nft_gen_attributes { · 353 unmodified lines
970};989};
971#define NFTA_GEN_MAX (__NFTA_GEN_MAX - 1)990#define NFTA_GEN_MAX (__NFTA_GEN_MAX - 1)
972 991
992/**
993 * enum nft_trace_attributes - nf_tables trace netlink attributes
994 *
995 * @NFTA_TRACE_TABLE: name of the table (NLA_STRING)
996 * @NFTA_TRACE_CHAIN: name of the chain (NLA_STRING)
997 * @NFTA_TRACE_RULE_HANDLE: numeric handle of the rule (NLA_U64)
998 * @NFTA_TRACE_TYPE: type of the event (NLA_U32: nft_trace_types)
999 * @NFTA_TRACE_VERDICT: verdict returned by hook (NLA_NESTED: nft_verdicts)
1000 * @NFTA_TRACE_ID: pseudo-id, same for each skb traced (NLA_U32)
1001 * @NFTA_TRACE_LL_HEADER: linklayer header (NLA_BINARY)
1002 * @NFTA_TRACE_NETWORK_HEADER: network header (NLA_BINARY)
1003 * @NFTA_TRACE_TRANSPORT_HEADER: transport header (NLA_BINARY)
1004 * @NFTA_TRACE_IIF: indev ifindex (NLA_U32)
1005 * @NFTA_TRACE_IIFTYPE: netdev->type of indev (NLA_U16)
1006 * @NFTA_TRACE_OIF: outdev ifindex (NLA_U32)
1007 * @NFTA_TRACE_OIFTYPE: netdev->type of outdev (NLA_U16)
1008 * @NFTA_TRACE_MARK: nfmark (NLA_U32)
1009 * @NFTA_TRACE_NFPROTO: nf protocol processed (NLA_U32)
1010 * @NFTA_TRACE_POLICY: policy that decided fate of packet (NLA_U32)
1011 */
1012enum nft_trace_attibutes {
1013 NFTA_TRACE_UNSPEC,
1014 NFTA_TRACE_TABLE,
1015 NFTA_TRACE_CHAIN,
1016 NFTA_TRACE_RULE_HANDLE,
1017 NFTA_TRACE_TYPE,
1018 NFTA_TRACE_VERDICT,
1019 NFTA_TRACE_ID,
1020 NFTA_TRACE_LL_HEADER,
1021 NFTA_TRACE_NETWORK_HEADER,
1022 NFTA_TRACE_TRANSPORT_HEADER,
1023 NFTA_TRACE_IIF,
1024 NFTA_TRACE_IIFTYPE,
1025 NFTA_TRACE_OIF,
1026 NFTA_TRACE_OIFTYPE,
1027 NFTA_TRACE_MARK,
1028 NFTA_TRACE_NFPROTO,
1029 NFTA_TRACE_POLICY,
1030 __NFTA_TRACE_MAX
1031};
1032#define NFTA_TRACE_MAX (__NFTA_TRACE_MAX - 1)
1033
1034enum nft_trace_types {
1035 NFT_TRACETYPE_UNSPEC,
1036 NFT_TRACETYPE_POLICY,
1037 NFT_TRACETYPE_RETURN,
1038 NFT_TRACETYPE_RULE,
1039 __NFT_TRACETYPE_MAX
1040};
1041#define NFT_TRACETYPE_MAX (__NFT_TRACETYPE_MAX - 1)
973#endif /* _LINUX_NF_TABLES_H */1042#endif /* _LINUX_NF_TABLES_H */
include/uapi/linux/netfilter/nfnetlink.h+2−0
@@ -22,6 +22,8 @@ enum nfnetlink_groups { · 21 unmodified lines
22#define NFNLGRP_NFTABLES NFNLGRP_NFTABLES22#define NFNLGRP_NFTABLES NFNLGRP_NFTABLES
23 NFNLGRP_ACCT_QUOTA,23 NFNLGRP_ACCT_QUOTA,
24#define NFNLGRP_ACCT_QUOTA NFNLGRP_ACCT_QUOTA24#define NFNLGRP_ACCT_QUOTA NFNLGRP_ACCT_QUOTA
25 NFNLGRP_NFTRACE,
26#define NFNLGRP_NFTRACE NFNLGRP_NFTRACE
25 __NFNLGRP_MAX,27 __NFNLGRP_MAX,
26};28};
27#define NFNLGRP_MAX (__NFNLGRP_MAX - 1)29#define NFNLGRP_MAX (__NFNLGRP_MAX - 1)
include/uapi/linux/netfilter/xt_HMARK.h+1−0
@@ -2,6 +2,7 @@ · 1 unmodified line
2#define XT_HMARK_H_2#define XT_HMARK_H_
3 3
4#include <linux/types.h>4#include <linux/types.h>
5#include <linux/netfilter.h>
5 6
6enum {7enum {
7 XT_HMARK_SADDR_MASK,8 XT_HMARK_SADDR_MASK,
include/uapi/linux/netfilter/xt_RATEEST.h+1−0
@@ -2,6 +2,7 @@ · 1 unmodified line
2#define _XT_RATEEST_TARGET_H2#define _XT_RATEEST_TARGET_H
3 3
4#include <linux/types.h>4#include <linux/types.h>
5#include <linux/if.h>
5 6
6struct xt_rateest_target_info {7struct xt_rateest_target_info {
7 char name[IFNAMSIZ];8 char name[IFNAMSIZ];
include/uapi/linux/netfilter/xt_TEE.h+2−0
@@ -1,6 +1,8 @@
1#ifndef _XT_TEE_TARGET_H1#ifndef _XT_TEE_TARGET_H
2#define _XT_TEE_TARGET_H2#define _XT_TEE_TARGET_H
3 3
4#include <linux/netfilter.h>
5
4struct xt_tee_tginfo {6struct xt_tee_tginfo {
5 union nf_inet_addr gw;7 union nf_inet_addr gw;
6 char oif[16];8 char oif[16];
include/uapi/linux/netfilter/xt_TPROXY.h+1−0
@@ -2,6 +2,7 @@ · 1 unmodified line
2#define _XT_TPROXY_H2#define _XT_TPROXY_H
3 3
4#include <linux/types.h>4#include <linux/types.h>
5#include <linux/netfilter.h>
5 6
6/* TPROXY target is capable of marking the packet to perform7/* TPROXY target is capable of marking the packet to perform
7 * redirection. We can get rid of that whenever we get support for8 * redirection. We can get rid of that whenever we get support for
include/uapi/linux/netfilter/xt_cgroup.h+14−1
@@ -2,10 +2,23 @@ · 1 unmodified line
2#define _UAPI_XT_CGROUP_H2#define _UAPI_XT_CGROUP_H
3 3
4#include <linux/types.h>4#include <linux/types.h>
5#include <linux/limits.h>
5 6
6struct xt_cgroup_info {7struct xt_cgroup_info_v0 {
7 __u32 id;8 __u32 id;
8 __u32 invert;9 __u32 invert;
9};10};
10 11
12struct xt_cgroup_info_v1 {
13 __u8 has_path;
14 __u8 has_classid;
15 __u8 invert_path;
16 __u8 invert_classid;
17 char path[PATH_MAX];
18 __u32 classid;
19
20 /* kernel internal data */
21 void *priv __attribute__((aligned(8)));
22};
23
11#endif /* _UAPI_XT_CGROUP_H */24#endif /* _UAPI_XT_CGROUP_H */
include/uapi/linux/netfilter/xt_hashlimit.h+1−0
@@ -2,6 +2,7 @@ · 1 unmodified line
2#define _UAPI_XT_HASHLIMIT_H2#define _UAPI_XT_HASHLIMIT_H
3 3
4#include <linux/types.h>4#include <linux/types.h>
5#include <linux/if.h>
5 6
6/* timings are in milliseconds. */7/* timings are in milliseconds. */
7#define XT_HASHLIMIT_SCALE 100008#define XT_HASHLIMIT_SCALE 10000
include/uapi/linux/netfilter/xt_ipvs.h+1−0
@@ -2,6 +2,7 @@ · 1 unmodified line
2#define _XT_IPVS_H2#define _XT_IPVS_H
3 3
4#include <linux/types.h>4#include <linux/types.h>
5#include <linux/netfilter.h>
5 6
6enum {7enum {
7 XT_IPVS_IPVS_PROPERTY = 1 << 0, /* all other options imply this one */8 XT_IPVS_IPVS_PROPERTY = 1 << 0, /* all other options imply this one */
include/uapi/linux/netfilter/xt_mac.h+2−0
@@ -1,6 +1,8 @@
1#ifndef _XT_MAC_H1#ifndef _XT_MAC_H
2#define _XT_MAC_H2#define _XT_MAC_H
3 3
4#include <linux/if_ether.h>
5
4struct xt_mac_info {6struct xt_mac_info {
5 unsigned char srcaddr[ETH_ALEN];7 unsigned char srcaddr[ETH_ALEN];
6 int invert;8 int invert;
include/uapi/linux/netfilter/xt_osf.h+2−0
@@ -20,6 +20,8 @@ · 19 unmodified lines
20#define _XT_OSF_H20#define _XT_OSF_H
21 21
22#include <linux/types.h>22#include <linux/types.h>
23#include <linux/ip.h>
24#include <linux/tcp.h>
23 25
24#define MAXGENRELEN 3226#define MAXGENRELEN 32
25 27
include/uapi/linux/netfilter/xt_physdev.h+1−1
@@ -2,7 +2,7 @@ · 1 unmodified line
2#define _UAPI_XT_PHYSDEV_H2#define _UAPI_XT_PHYSDEV_H
3 3
4#include <linux/types.h>4#include <linux/types.h>
5 5#include <linux/if.h>
6 6
7#define XT_PHYSDEV_OP_IN 0x017#define XT_PHYSDEV_OP_IN 0x01
8#define XT_PHYSDEV_OP_OUT 0x028#define XT_PHYSDEV_OP_OUT 0x02
include/uapi/linux/netfilter/xt_policy.h+2−0
@@ -2,6 +2,8 @@ · 1 unmodified line
2#define _XT_POLICY_H2#define _XT_POLICY_H
3 3
4#include <linux/types.h>4#include <linux/types.h>
5#include <linux/in.h>
6#include <linux/in6.h>
5 7
6#define XT_POLICY_MAX_ELEM 48#define XT_POLICY_MAX_ELEM 4
7 9
include/uapi/linux/netfilter/xt_rateest.h+1−0
@@ -2,6 +2,7 @@ · 1 unmodified line
2#define _XT_RATEEST_MATCH_H2#define _XT_RATEEST_MATCH_H
3 3
4#include <linux/types.h>4#include <linux/types.h>
5#include <linux/if.h>
5 6
6enum xt_rateest_match_flags {7enum xt_rateest_match_flags {
7 XT_RATEEST_MATCH_INVERT = 1<<0,8 XT_RATEEST_MATCH_INVERT = 1<<0,
include/uapi/linux/netfilter/xt_recent.h+1−0
@@ -2,6 +2,7 @@ · 1 unmodified line
2#define _LINUX_NETFILTER_XT_RECENT_H 12#define _LINUX_NETFILTER_XT_RECENT_H 1
3 3
4#include <linux/types.h>4#include <linux/types.h>
5#include <linux/netfilter.h>
5 6
6enum {7enum {
7 XT_RECENT_CHECK = 1 << 0,8 XT_RECENT_CHECK = 1 << 0,
include/uapi/linux/netfilter/xt_sctp.h+6−6
@@ -66,26 +66,26 @@ struct xt_sctp_info { · 65 unmodified lines
66 66
67#define SCTP_CHUNKMAP_IS_CLEAR(chunkmap) \67#define SCTP_CHUNKMAP_IS_CLEAR(chunkmap) \
68 __sctp_chunkmap_is_clear((chunkmap), ARRAY_SIZE(chunkmap))68 __sctp_chunkmap_is_clear((chunkmap), ARRAY_SIZE(chunkmap))
69static inline bool69static inline _Bool
70__sctp_chunkmap_is_clear(const __u32 *chunkmap, unsigned int n)70__sctp_chunkmap_is_clear(const __u32 *chunkmap, unsigned int n)
71{71{
72 unsigned int i;72 unsigned int i;
73 for (i = 0; i < n; ++i)73 for (i = 0; i < n; ++i)
74 if (chunkmap[i])74 if (chunkmap[i])
75 return false;75 return 0;
76 return true;76 return 1;
77}77}
78 78
79#define SCTP_CHUNKMAP_IS_ALL_SET(chunkmap) \79#define SCTP_CHUNKMAP_IS_ALL_SET(chunkmap) \
80 __sctp_chunkmap_is_all_set((chunkmap), ARRAY_SIZE(chunkmap))80 __sctp_chunkmap_is_all_set((chunkmap), ARRAY_SIZE(chunkmap))
81static inline bool81static inline _Bool
82__sctp_chunkmap_is_all_set(const __u32 *chunkmap, unsigned int n)82__sctp_chunkmap_is_all_set(const __u32 *chunkmap, unsigned int n)
83{83{
84 unsigned int i;84 unsigned int i;
85 for (i = 0; i < n; ++i)85 for (i = 0; i < n; ++i)
86 if (chunkmap[i] != ~0U)86 if (chunkmap[i] != ~0U)
87 return false;87 return 0;
88 return true;88 return 1;
89}89}
90 90
91#endif /* _XT_SCTP_H_ */91#endif /* _XT_SCTP_H_ */
include/uapi/linux/netfilter_arp/arp_tables.h+1−0
@@ -11,6 +11,7 @@ · 10 unmodified lines
11 11
12#include <linux/types.h>12#include <linux/types.h>
13#include <linux/compiler.h>13#include <linux/compiler.h>
14#include <linux/if.h>
14#include <linux/netfilter_arp.h>15#include <linux/netfilter_arp.h>
15 16
16#include <linux/netfilter/x_tables.h>17#include <linux/netfilter/x_tables.h>
include/uapi/linux/netfilter_bridge.h+1−0
@@ -4,6 +4,7 @@ · 3 unmodified lines
4/* bridge-specific defines for netfilter. 4/* bridge-specific defines for netfilter.
5 */5 */
6 6
7#include <linux/in.h>
7#include <linux/netfilter.h>8#include <linux/netfilter.h>
8#include <linux/if_ether.h>9#include <linux/if_ether.h>
9#include <linux/if_vlan.h>10#include <linux/if_vlan.h>
include/uapi/linux/netfilter_bridge/ebt_arp.h+1−0
@@ -2,6 +2,7 @@ · 1 unmodified line
2#define __LINUX_BRIDGE_EBT_ARP_H2#define __LINUX_BRIDGE_EBT_ARP_H
3 3
4#include <linux/types.h>4#include <linux/types.h>
5#include <linux/if_ether.h>
5 6
6#define EBT_ARP_OPCODE 0x017#define EBT_ARP_OPCODE 0x01
7#define EBT_ARP_HTYPE 0x028#define EBT_ARP_HTYPE 0x02
include/uapi/linux/netfilter_bridge/ebt_arpreply.h+2−0
@@ -1,6 +1,8 @@
1#ifndef __LINUX_BRIDGE_EBT_ARPREPLY_H1#ifndef __LINUX_BRIDGE_EBT_ARPREPLY_H
2#define __LINUX_BRIDGE_EBT_ARPREPLY_H2#define __LINUX_BRIDGE_EBT_ARPREPLY_H
3 3
4#include <linux/if_ether.h>
5
4struct ebt_arpreply_info {6struct ebt_arpreply_info {
5 unsigned char mac[ETH_ALEN];7 unsigned char mac[ETH_ALEN];
6 int target;8 int target;
include/uapi/linux/netfilter_bridge/ebt_ip6.h+1−0
@@ -13,6 +13,7 @@ · 12 unmodified lines
13#define __LINUX_BRIDGE_EBT_IP6_H13#define __LINUX_BRIDGE_EBT_IP6_H
14 14
15#include <linux/types.h>15#include <linux/types.h>
16#include <linux/in6.h>
16 17
17#define EBT_IP6_SOURCE 0x0118#define EBT_IP6_SOURCE 0x01
18#define EBT_IP6_DEST 0x0219#define EBT_IP6_DEST 0x02
include/uapi/linux/netfilter_bridge/ebt_nat.h+2−0
@@ -1,6 +1,8 @@
1#ifndef __LINUX_BRIDGE_EBT_NAT_H1#ifndef __LINUX_BRIDGE_EBT_NAT_H
2#define __LINUX_BRIDGE_EBT_NAT_H2#define __LINUX_BRIDGE_EBT_NAT_H
3 3
4#include <linux/if_ether.h>
5
4#define NAT_ARP_BIT (0x00000010)6#define NAT_ARP_BIT (0x00000010)
5struct ebt_nat_info {7struct ebt_nat_info {
6 unsigned char mac[ETH_ALEN];8 unsigned char mac[ETH_ALEN];
include/uapi/linux/netfilter_bridge/ebtables.h+4−2
@@ -12,6 +12,8 @@ · 11 unmodified lines
12 12
13#ifndef _UAPI__LINUX_BRIDGE_EFF_H13#ifndef _UAPI__LINUX_BRIDGE_EFF_H
14#define _UAPI__LINUX_BRIDGE_EFF_H14#define _UAPI__LINUX_BRIDGE_EFF_H
15#include <linux/types.h>
16#include <linux/if.h>
15#include <linux/netfilter_bridge.h>17#include <linux/netfilter_bridge.h>
16 18
17#define EBT_TABLE_MAXNAMELEN 3219#define EBT_TABLE_MAXNAMELEN 32
@@ -33,8 +35,8 @@ struct xt_match; · 15 unmodified lines
33struct xt_target;35struct xt_target;
34 36
35struct ebt_counter {37struct ebt_counter {
36 uint64_t pcnt;38 __u64 pcnt;
37 uint64_t bcnt;39 __u64 bcnt;
38};40};
39 41
40struct ebt_replace {42struct ebt_replace {
include/uapi/linux/netfilter_ipv4/ip_tables.h+1−0
@@ -17,6 +17,7 @@ · 16 unmodified lines
17 17
18#include <linux/types.h>18#include <linux/types.h>
19#include <linux/compiler.h>19#include <linux/compiler.h>
20#include <linux/if.h>
20#include <linux/netfilter_ipv4.h>21#include <linux/netfilter_ipv4.h>
21 22
22#include <linux/netfilter/x_tables.h>23#include <linux/netfilter/x_tables.h>
include/uapi/linux/netfilter_ipv6/ip6_tables.h+1−0
@@ -17,6 +17,7 @@ · 16 unmodified lines
17 17
18#include <linux/types.h>18#include <linux/types.h>
19#include <linux/compiler.h>19#include <linux/compiler.h>
20#include <linux/if.h>
20#include <linux/netfilter_ipv6.h>21#include <linux/netfilter_ipv6.h>
21 22
22#include <linux/netfilter/x_tables.h>23#include <linux/netfilter/x_tables.h>
include/uapi/linux/netfilter_ipv6/ip6t_rt.h+1−1
@@ -2,7 +2,7 @@ · 1 unmodified line
2#define _IP6T_RT_H2#define _IP6T_RT_H
3 3
4#include <linux/types.h>4#include <linux/types.h>
5/*#include <linux/in6.h>*/5#include <linux/in6.h>
6 6
7#define IP6T_RT_HOPS 167#define IP6T_RT_HOPS 16
8 8

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t