A number of netfilter header-files used declarations and definitions from other headers without including them. Added include directives to make those declarations and definitions available.
Showing the changes to include/linux (10 of 27 files). Show all
Unified · Split
| @@ -2,6 +2,10 @@ · 1 unmodified line | ||
| 2 | 2 | #ifndef _IP_SET_GETPORT_H |
| 3 | 3 | #define _IP_SET_GETPORT_H |
| 4 | 4 | |
| 5 | +#include <linux/skbuff.h> | |
| 6 | +#include <linux/types.h> | |
| 7 | +#include <uapi/linux/in.h> | |
| 8 | + | |
| 5 | 9 | extern bool ip_set_get_ip4_port(const struct sk_buff *skb, bool src, |
| 6 | 10 | __be16 *port, u8 *proto); |
| 7 | 11 | |
| @@ -3,6 +3,10 @@ · 2 unmodified lines | ||
| 3 | 3 | #define _NF_CONNTRACK_AMANDA_H |
| 4 | 4 | /* AMANDA tracking. */ |
| 5 | 5 | |
| 6 | +#include <linux/netfilter.h> | |
| 7 | +#include <linux/skbuff.h> | |
| 8 | +#include <net/netfilter/nf_conntrack_expect.h> | |
| 9 | + | |
| 6 | 10 | extern unsigned int (*nf_nat_amanda_hook)(struct sk_buff *skb, |
| 7 | 11 | enum ip_conntrack_info ctinfo, |
| 8 | 12 | unsigned int protoff, |
| @@ -2,8 +2,12 @@ · 1 unmodified line | ||
| 2 | 2 | #ifndef _NF_CONNTRACK_FTP_H |
| 3 | 3 | #define _NF_CONNTRACK_FTP_H |
| 4 | 4 | |
| 5 | +#include <linux/netfilter.h> | |
| 6 | +#include <linux/skbuff.h> | |
| 7 | +#include <linux/types.h> | |
| 8 | +#include <net/netfilter/nf_conntrack_expect.h> | |
| 5 | 9 | #include <uapi/linux/netfilter/nf_conntrack_ftp.h> |
| 6 | − | |
| 10 | +#include <uapi/linux/netfilter/nf_conntrack_tuple_common.h> | |
| 7 | 11 | |
| 8 | 12 | #define FTP_PORT 21 |
| 9 | 13 | |
| @@ -20,8 +24,6 @@ struct nf_ct_ftp_master { · 10 unmodified lines | ||
| 20 | 24 | u_int16_t flags[IP_CT_DIR_MAX]; |
| 21 | 25 | }; |
| 22 | 26 | |
| 23 | −struct nf_conntrack_expect; | |
| 24 | − | |
| 25 | 27 | /* For NAT to hook in when we find a packet which describes what other |
| 26 | 28 | * connection we should expect. */ |
| 27 | 29 | extern unsigned int (*nf_nat_ftp_hook)(struct sk_buff *skb, |
| @@ -4,7 +4,12 @@ · 3 unmodified lines | ||
| 4 | 4 | |
| 5 | 5 | #ifdef __KERNEL__ |
| 6 | 6 | |
| 7 | +#include <linux/netfilter.h> | |
| 8 | +#include <linux/skbuff.h> | |
| 9 | +#include <linux/types.h> | |
| 7 | 10 | #include <linux/netfilter/nf_conntrack_h323_asn1.h> |
| 11 | +#include <net/netfilter/nf_conntrack_expect.h> | |
| 12 | +#include <uapi/linux/netfilter/nf_conntrack_tuple_common.h> | |
| 8 | 13 | |
| 9 | 14 | #define RAS_PORT 1719 |
| 10 | 15 | #define Q931_PORT 1720 |
| @@ -28,8 +33,6 @@ struct nf_ct_h323_master { · 17 unmodified lines | ||
| 28 | 33 | }; |
| 29 | 34 | }; |
| 30 | 35 | |
| 31 | −struct nf_conn; | |
| 32 | − | |
| 33 | 36 | int get_h225_addr(struct nf_conn *ct, unsigned char *data, |
| 34 | 37 | TransportAddress *taddr, union nf_inet_addr *addr, |
| 35 | 38 | __be16 *port); |
| @@ -37,6 +37,8 @@ · 36 unmodified lines | ||
| 37 | 37 | /***************************************************************************** |
| 38 | 38 | * H.323 Types |
| 39 | 39 | ****************************************************************************/ |
| 40 | + | |
| 41 | +#include <linux/types.h> | |
| 40 | 42 | #include <linux/netfilter/nf_conntrack_h323_types.h> |
| 41 | 43 | |
| 42 | 44 | typedef struct { |
| @@ -4,6 +4,10 @@ · 3 unmodified lines | ||
| 4 | 4 | |
| 5 | 5 | #ifdef __KERNEL__ |
| 6 | 6 | |
| 7 | +#include <linux/netfilter.h> | |
| 8 | +#include <linux/skbuff.h> | |
| 9 | +#include <net/netfilter/nf_conntrack_expect.h> | |
| 10 | + | |
| 7 | 11 | #define IRC_PORT 6667 |
| 8 | 12 | |
| 9 | 13 | extern unsigned int (*nf_nat_irc_hook)(struct sk_buff *skb, |
| @@ -3,7 +3,12 @@ · 2 unmodified lines | ||
| 3 | 3 | #ifndef _NF_CONNTRACK_PPTP_H |
| 4 | 4 | #define _NF_CONNTRACK_PPTP_H |
| 5 | 5 | |
| 6 | +#include <linux/netfilter.h> | |
| 7 | +#include <linux/skbuff.h> | |
| 8 | +#include <linux/types.h> | |
| 6 | 9 | #include <linux/netfilter/nf_conntrack_common.h> |
| 10 | +#include <net/netfilter/nf_conntrack_expect.h> | |
| 11 | +#include <uapi/linux/netfilter/nf_conntrack_tuple_common.h> | |
| 7 | 12 | |
| 8 | 13 | extern const char *const pptp_msg_name[]; |
| 9 | 14 | |
| @@ -297,10 +302,6 @@ union pptp_ctrl_union { · 287 unmodified lines | ||
| 297 | 302 | struct PptpSetLinkInfo setlink; |
| 298 | 303 | }; |
| 299 | 304 | |
| 300 | −/* crap needed for nf_conntrack_compat.h */ | |
| 301 | −struct nf_conn; | |
| 302 | −struct nf_conntrack_expect; | |
| 303 | − | |
| 304 | 305 | extern int |
| 305 | 306 | (*nf_nat_pptp_hook_outbound)(struct sk_buff *skb, |
| 306 | 307 | struct nf_conn *ct, enum ip_conntrack_info ctinfo, |
| @@ -3,9 +3,9 @@ · 2 unmodified lines | ||
| 3 | 3 | #define __NF_CONNTRACK_SIP_H__ |
| 4 | 4 | #ifdef __KERNEL__ |
| 5 | 5 | |
| 6 | −#include <net/netfilter/nf_conntrack_expect.h> | |
| 7 | − | |
| 6 | +#include <linux/skbuff.h> | |
| 8 | 7 | #include <linux/types.h> |
| 8 | +#include <net/netfilter/nf_conntrack_expect.h> | |
| 9 | 9 | |
| 10 | 10 | #define SIP_PORT 5060 |
| 11 | 11 | #define SIP_TIMEOUT 3600 |
| @@ -2,6 +2,9 @@ · 1 unmodified line | ||
| 2 | 2 | #ifndef _NF_CONNTRACK_SNMP_H |
| 3 | 3 | #define _NF_CONNTRACK_SNMP_H |
| 4 | 4 | |
| 5 | +#include <linux/netfilter.h> | |
| 6 | +#include <linux/skbuff.h> | |
| 7 | + | |
| 5 | 8 | extern int (*nf_nat_snmp_hook)(struct sk_buff *skb, |
| 6 | 9 | unsigned int protoff, |
| 7 | 10 | struct nf_conn *ct, |
| @@ -4,6 +4,11 @@ · 3 unmodified lines | ||
| 4 | 4 | |
| 5 | 5 | #define TFTP_PORT 69 |
| 6 | 6 | |
| 7 | +#include <linux/netfilter.h> | |
| 8 | +#include <linux/skbuff.h> | |
| 9 | +#include <linux/types.h> | |
| 10 | +#include <net/netfilter/nf_conntrack_expect.h> | |
| 11 | + | |
| 7 | 12 | struct tftphdr { |
| 8 | 13 | __be16 opcode; |
| 9 | 14 | }; |