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

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

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 @@
11 #ifndef _UAPI__IP_SET_BITMAP_H
22 #define _UAPI__IP_SET_BITMAP_H
33
4+#include <linux/netfilter/ipset/ip_set.h>
5+
46 /* Bitmap type specific error codes */
57 enum {
68 /* 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 @@
11 #ifndef _UAPI__IP_SET_HASH_H
22 #define _UAPI__IP_SET_HASH_H
33
4+#include <linux/netfilter/ipset/ip_set.h>
5+
46 /* Hash type specific error codes */
57 enum {
68 /* Hash is full */
include/uapi/linux/netfilter/ipset/ip_set_list.h+2−0
@@ -1,6 +1,8 @@
11 #ifndef _UAPI__IP_SET_LIST_H
22 #define _UAPI__IP_SET_LIST_H
33
4+#include <linux/netfilter/ipset/ip_set.h>
5+
46 /* List type specific error codes */
57 enum {
68 /* 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 @@
11 #ifndef _NF_CONNTRACK_TUPLE_COMMON_H
22 #define _NF_CONNTRACK_TUPLE_COMMON_H
33
4+#include <linux/types.h>
5+#include <linux/netfilter.h>
6+
47 enum ip_conntrack_dir {
58 IP_CT_DIR_ORIGINAL,
69 IP_CT_DIR_REPLY,
include/uapi/linux/netfilter/xt_HMARK.h+1−0
@@ -2,6 +2,7 @@ · 1 unmodified line
22 #define XT_HMARK_H_
33
44 #include <linux/types.h>
5+#include <linux/netfilter.h>
56
67 enum {
78 XT_HMARK_SADDR_MASK,
include/uapi/linux/netfilter/xt_RATEEST.h+1−0
@@ -2,6 +2,7 @@ · 1 unmodified line
22 #define _XT_RATEEST_TARGET_H
33
44 #include <linux/types.h>
5+#include <linux/if.h>
56
67 struct xt_rateest_target_info {
78 char name[IFNAMSIZ];
include/uapi/linux/netfilter/xt_TEE.h+2−0
@@ -1,6 +1,8 @@
11 #ifndef _XT_TEE_TARGET_H
22 #define _XT_TEE_TARGET_H
33
4+#include <linux/netfilter.h>
5+
46 struct xt_tee_tginfo {
57 union nf_inet_addr gw;
68 char oif[16];
include/uapi/linux/netfilter/xt_TPROXY.h+1−0
@@ -2,6 +2,7 @@ · 1 unmodified line
22 #define _XT_TPROXY_H
33
44 #include <linux/types.h>
5+#include <linux/netfilter.h>
56
67 /* TPROXY target is capable of marking the packet to perform
78 * 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
22 #define _UAPI_XT_HASHLIMIT_H
33
44 #include <linux/types.h>
5+#include <linux/if.h>
56
67 /* timings are in milliseconds. */
78 #define XT_HASHLIMIT_SCALE 10000
include/uapi/linux/netfilter/xt_ipvs.h+1−0
@@ -2,6 +2,7 @@ · 1 unmodified line
22 #define _XT_IPVS_H
33
44 #include <linux/types.h>
5+#include <linux/netfilter.h>
56
67 enum {
78 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 @@
11 #ifndef _XT_MAC_H
22 #define _XT_MAC_H
33
4+#include <linux/if_ether.h>
5+
46 struct xt_mac_info {
57 unsigned char srcaddr[ETH_ALEN];
68 int invert;
include/uapi/linux/netfilter/xt_osf.h+2−0
@@ -20,6 +20,8 @@ · 19 unmodified lines
2020 #define _XT_OSF_H
2121
2222 #include <linux/types.h>
23+#include <linux/ip.h>
24+#include <linux/tcp.h>
2325
2426 #define MAXGENRELEN 32
2527
include/uapi/linux/netfilter/xt_physdev.h+1−1
@@ -2,7 +2,7 @@ · 1 unmodified line
22 #define _UAPI_XT_PHYSDEV_H
33
44 #include <linux/types.h>
5−
5+#include <linux/if.h>
66
77 #define XT_PHYSDEV_OP_IN 0x01
88 #define XT_PHYSDEV_OP_OUT 0x02
include/uapi/linux/netfilter/xt_policy.h+2−0
@@ -2,6 +2,8 @@ · 1 unmodified line
22 #define _XT_POLICY_H
33
44 #include <linux/types.h>
5+#include <linux/in.h>
6+#include <linux/in6.h>
57
68 #define XT_POLICY_MAX_ELEM 4
79
include/uapi/linux/netfilter/xt_rateest.h+1−0
@@ -2,6 +2,7 @@ · 1 unmodified line
22 #define _XT_RATEEST_MATCH_H
33
44 #include <linux/types.h>
5+#include <linux/if.h>
56
67 enum xt_rateest_match_flags {
78 XT_RATEEST_MATCH_INVERT = 1<<0,
include/uapi/linux/netfilter/xt_recent.h+1−0
@@ -2,6 +2,7 @@ · 1 unmodified line
22 #define _LINUX_NETFILTER_XT_RECENT_H 1
33
44 #include <linux/types.h>
5+#include <linux/netfilter.h>
56
67 enum {
78 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
6666
6767 #define SCTP_CHUNKMAP_IS_CLEAR(chunkmap) \
6868 __sctp_chunkmap_is_clear((chunkmap), ARRAY_SIZE(chunkmap))
69−static inline bool
69+static inline _Bool
7070 __sctp_chunkmap_is_clear(const __u32 *chunkmap, unsigned int n)
7171 {
7272 unsigned int i;
7373 for (i = 0; i < n; ++i)
7474 if (chunkmap[i])
75− return false;
76− return true;
75+ return 0;
76+ return 1;
7777 }
7878
7979 #define SCTP_CHUNKMAP_IS_ALL_SET(chunkmap) \
8080 __sctp_chunkmap_is_all_set((chunkmap), ARRAY_SIZE(chunkmap))
81−static inline bool
81+static inline _Bool
8282 __sctp_chunkmap_is_all_set(const __u32 *chunkmap, unsigned int n)
8383 {
8484 unsigned int i;
8585 for (i = 0; i < n; ++i)
8686 if (chunkmap[i] != ~0U)
87− return false;
88− return true;
87+ return 0;
88+ return 1;
8989 }
9090
9191 #endif /* _XT_SCTP_H_ */
include/uapi/linux/netfilter_arp/arp_tables.h+1−0
@@ -11,6 +11,7 @@ · 10 unmodified lines
1111
1212 #include <linux/types.h>
1313 #include <linux/compiler.h>
14+#include <linux/if.h>
1415 #include <linux/netfilter_arp.h>
1516
1617 #include <linux/netfilter/x_tables.h>
include/uapi/linux/netfilter_bridge.h+1−0
@@ -4,6 +4,7 @@ · 3 unmodified lines
44 /* bridge-specific defines for netfilter.
55 */
66
7+#include <linux/in.h>
78 #include <linux/netfilter.h>
89 #include <linux/if_ether.h>
910 #include <linux/if_vlan.h>
include/uapi/linux/netfilter_bridge/ebt_arp.h+1−0
@@ -2,6 +2,7 @@ · 1 unmodified line
22 #define __LINUX_BRIDGE_EBT_ARP_H
33
44 #include <linux/types.h>
5+#include <linux/if_ether.h>
56
67 #define EBT_ARP_OPCODE 0x01
78 #define EBT_ARP_HTYPE 0x02
include/uapi/linux/netfilter_bridge/ebt_arpreply.h+2−0
@@ -1,6 +1,8 @@
11 #ifndef __LINUX_BRIDGE_EBT_ARPREPLY_H
22 #define __LINUX_BRIDGE_EBT_ARPREPLY_H
33
4+#include <linux/if_ether.h>
5+
46 struct ebt_arpreply_info {
57 unsigned char mac[ETH_ALEN];
68 int target;
include/uapi/linux/netfilter_bridge/ebt_ip6.h+1−0
@@ -13,6 +13,7 @@ · 12 unmodified lines
1313 #define __LINUX_BRIDGE_EBT_IP6_H
1414
1515 #include <linux/types.h>
16+#include <linux/in6.h>
1617
1718 #define EBT_IP6_SOURCE 0x01
1819 #define EBT_IP6_DEST 0x02
include/uapi/linux/netfilter_bridge/ebt_nat.h+2−0
@@ -1,6 +1,8 @@
11 #ifndef __LINUX_BRIDGE_EBT_NAT_H
22 #define __LINUX_BRIDGE_EBT_NAT_H
33
4+#include <linux/if_ether.h>
5+
46 #define NAT_ARP_BIT (0x00000010)
57 struct ebt_nat_info {
68 unsigned char mac[ETH_ALEN];
include/uapi/linux/netfilter_ipv4/ip_tables.h+1−0
@@ -17,6 +17,7 @@ · 16 unmodified lines
1717
1818 #include <linux/types.h>
1919 #include <linux/compiler.h>
20+#include <linux/if.h>
2021 #include <linux/netfilter_ipv4.h>
2122
2223 #include <linux/netfilter/x_tables.h>
include/uapi/linux/netfilter_ipv6/ip6_tables.h+1−0
@@ -17,6 +17,7 @@ · 16 unmodified lines
1717
1818 #include <linux/types.h>
1919 #include <linux/compiler.h>
20+#include <linux/if.h>
2021 #include <linux/netfilter_ipv6.h>
2122
2223 #include <linux/netfilter/x_tables.h>
include/uapi/linux/netfilter_ipv6/ip6t_rt.h+1−1
@@ -2,7 +2,7 @@ · 1 unmodified line
22 #define _IP6T_RT_H
33
44 #include <linux/types.h>
5−/*#include <linux/in6.h>*/
5+#include <linux/in6.h>
66
77 #define IP6T_RT_HOPS 16
88

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