History

netfilter: fix include files for compilation

Add missing header dependencies and other small changes so that each file compiles alone in userspace.

Mikko Rapeli committed 11 years ago

Commit 1ffad831 parent dad158126 files · +42 −8Browse files

Unified · Split

26 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_tuple_common.h +3 −0
  5. include/uapi/linux/netfilter/xt_HMARK.h +1 −0
  6. include/uapi/linux/netfilter/xt_RATEEST.h +1 −0
  7. include/uapi/linux/netfilter/xt_TEE.h +2 −0
  8. include/uapi/linux/netfilter/xt_TPROXY.h +1 −0
  9. include/uapi/linux/netfilter/xt_hashlimit.h +1 −0
  10. include/uapi/linux/netfilter/xt_ipvs.h +1 −0
  11. include/uapi/linux/netfilter/xt_mac.h +2 −0
  12. include/uapi/linux/netfilter/xt_osf.h +2 −0
  13. include/uapi/linux/netfilter/xt_physdev.h +1 −1
  14. include/uapi/linux/netfilter/xt_policy.h +2 −0
  15. include/uapi/linux/netfilter/xt_rateest.h +1 −0
  16. include/uapi/linux/netfilter/xt_recent.h +1 −0
  17. include/uapi/linux/netfilter/xt_sctp.h +6 −6
  18. include/uapi/linux/netfilter_arp/arp_tables.h +1 −0
  19. include/uapi/linux/netfilter_bridge.h +1 −0
  20. include/uapi/linux/netfilter_bridge/ebt_arp.h +1 −0
  21. include/uapi/linux/netfilter_bridge/ebt_arpreply.h +2 −0
  22. include/uapi/linux/netfilter_bridge/ebt_ip6.h +1 −0
  23. include/uapi/linux/netfilter_bridge/ebt_nat.h +2 −0
  24. include/uapi/linux/netfilter_ipv4/ip_tables.h +1 −0
  25. include/uapi/linux/netfilter_ipv6/ip6_tables.h +1 −0
  26. 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_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/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_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_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