Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1b2f04e authored by Jeremy Sowden's avatar Jeremy Sowden Committed by Pablo Neira Ayuso
Browse files

netfilter: add missing includes to a number of header-files. 



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.

Signed-off-by: default avatarJeremy Sowden <jeremy@azazel.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent bd96b4c7

include/linux/netfilter/ipset/ip_set_getport.h

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 
#ifndef _IP_SET_GETPORT_H

#define _IP_SET_GETPORT_H



#include <linux/skbuff.h>

#include <linux/types.h>

#include <uapi/linux/in.h>



extern bool ip_set_get_ip4_port(const struct sk_buff *skb, bool src,

				__be16 *port, u8 *proto);

include/linux/netfilter/nf_conntrack_amanda.h

+4 −0
Original line number Diff line number Diff line
@@ -3,6 +3,10 @@ 
#define _NF_CONNTRACK_AMANDA_H

/* AMANDA tracking. */



#include <linux/netfilter.h>

#include <linux/skbuff.h>

#include <net/netfilter/nf_conntrack_expect.h>



extern unsigned int (*nf_nat_amanda_hook)(struct sk_buff *skb,

					  enum ip_conntrack_info ctinfo,

					  unsigned int protoff,

include/linux/netfilter/nf_conntrack_ftp.h

+5 −3
Original line number Diff line number Diff line
@@ -2,8 +2,12 @@ 
#ifndef _NF_CONNTRACK_FTP_H

#define _NF_CONNTRACK_FTP_H



#include <linux/netfilter.h>

#include <linux/skbuff.h>

#include <linux/types.h>

#include <net/netfilter/nf_conntrack_expect.h>

#include <uapi/linux/netfilter/nf_conntrack_ftp.h>



#include <uapi/linux/netfilter/nf_conntrack_tuple_common.h>



#define FTP_PORT	21
@@ -20,8 +24,6 @@ struct nf_ct_ftp_master { 
	u_int16_t flags[IP_CT_DIR_MAX];

};



struct nf_conntrack_expect;



/* For NAT to hook in when we find a packet which describes what other

 * connection we should expect. */

extern unsigned int (*nf_nat_ftp_hook)(struct sk_buff *skb,

include/linux/netfilter/nf_conntrack_h323.h

+5 −2
Original line number Diff line number Diff line
@@ -4,7 +4,12 @@ 


#ifdef __KERNEL__



#include <linux/netfilter.h>

#include <linux/skbuff.h>

#include <linux/types.h>

#include <linux/netfilter/nf_conntrack_h323_asn1.h>

#include <net/netfilter/nf_conntrack_expect.h>

#include <uapi/linux/netfilter/nf_conntrack_tuple_common.h>



#define RAS_PORT 1719

#define Q931_PORT 1720
@@ -28,8 +33,6 @@ struct nf_ct_h323_master { 
	};

};



struct nf_conn;



int get_h225_addr(struct nf_conn *ct, unsigned char *data,

		  TransportAddress *taddr, union nf_inet_addr *addr,

		  __be16 *port);

include/linux/netfilter/nf_conntrack_h323_asn1.h

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
/*****************************************************************************

 * H.323 Types

 ****************************************************************************/



#include <linux/types.h>

#include <linux/netfilter/nf_conntrack_h323_types.h>



typedef struct {