History

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.

Jeremy Sowden committed 7 years ago

Commit a1b2f041 parent bd96b4c27 files · +80 −14Browse files

Showing the changes to include/linux (10 of 27 files). Show all

Unified · Split

10 files
  1. include/linux/netfilter/ipset/ip_set_getport.h +4 −0
  2. include/linux/netfilter/nf_conntrack_amanda.h +4 −0
  3. include/linux/netfilter/nf_conntrack_ftp.h +5 −3
  4. include/linux/netfilter/nf_conntrack_h323.h +5 −2
  5. include/linux/netfilter/nf_conntrack_h323_asn1.h +2 −0
  6. include/linux/netfilter/nf_conntrack_irc.h +4 −0
  7. include/linux/netfilter/nf_conntrack_pptp.h +5 −4
  8. include/linux/netfilter/nf_conntrack_sip.h +2 −2
  9. include/linux/netfilter/nf_conntrack_snmp.h +3 −0
  10. include/linux/netfilter/nf_conntrack_tftp.h +5 −0
include/linux/netfilter/ipset/ip_set_getport.h+4−0
@@ -2,6 +2,10 @@ · 1 unmodified line
2#ifndef _IP_SET_GETPORT_H2#ifndef _IP_SET_GETPORT_H
3#define _IP_SET_GETPORT_H3#define _IP_SET_GETPORT_H
4 4
5#include <linux/skbuff.h>
6#include <linux/types.h>
7#include <uapi/linux/in.h>
8
5extern bool ip_set_get_ip4_port(const struct sk_buff *skb, bool src,9extern bool ip_set_get_ip4_port(const struct sk_buff *skb, bool src,
6 __be16 *port, u8 *proto);10 __be16 *port, u8 *proto);
7 11
include/linux/netfilter/nf_conntrack_amanda.h+4−0
@@ -3,6 +3,10 @@ · 2 unmodified lines
3#define _NF_CONNTRACK_AMANDA_H3#define _NF_CONNTRACK_AMANDA_H
4/* AMANDA tracking. */4/* AMANDA tracking. */
5 5
6#include <linux/netfilter.h>
7#include <linux/skbuff.h>
8#include <net/netfilter/nf_conntrack_expect.h>
9
6extern unsigned int (*nf_nat_amanda_hook)(struct sk_buff *skb,10extern unsigned int (*nf_nat_amanda_hook)(struct sk_buff *skb,
7 enum ip_conntrack_info ctinfo,11 enum ip_conntrack_info ctinfo,
8 unsigned int protoff,12 unsigned int protoff,
include/linux/netfilter/nf_conntrack_ftp.h+5−3
@@ -2,8 +2,12 @@ · 1 unmodified line
2#ifndef _NF_CONNTRACK_FTP_H2#ifndef _NF_CONNTRACK_FTP_H
3#define _NF_CONNTRACK_FTP_H3#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#include <uapi/linux/netfilter/nf_conntrack_ftp.h>9#include <uapi/linux/netfilter/nf_conntrack_ftp.h>
6 10#include <uapi/linux/netfilter/nf_conntrack_tuple_common.h>
7 11
8#define FTP_PORT 2112#define FTP_PORT 21
9 13
@@ -20,8 +24,6 @@ struct nf_ct_ftp_master { · 10 unmodified lines
20 u_int16_t flags[IP_CT_DIR_MAX];24 u_int16_t flags[IP_CT_DIR_MAX];
21};25};
22 26
23struct nf_conntrack_expect;
24
25/* For NAT to hook in when we find a packet which describes what other27/* For NAT to hook in when we find a packet which describes what other
26 * connection we should expect. */28 * connection we should expect. */
27extern unsigned int (*nf_nat_ftp_hook)(struct sk_buff *skb,29extern unsigned int (*nf_nat_ftp_hook)(struct sk_buff *skb,
include/linux/netfilter/nf_conntrack_h323.h+5−2
@@ -4,7 +4,12 @@ · 3 unmodified lines
4 4
5#ifdef __KERNEL__5#ifdef __KERNEL__
6 6
7#include <linux/netfilter.h>
8#include <linux/skbuff.h>
9#include <linux/types.h>
7#include <linux/netfilter/nf_conntrack_h323_asn1.h>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#define RAS_PORT 171914#define RAS_PORT 1719
10#define Q931_PORT 172015#define Q931_PORT 1720
@@ -28,8 +33,6 @@ struct nf_ct_h323_master { · 17 unmodified lines
28 };33 };
29};34};
30 35
31struct nf_conn;
32
33int get_h225_addr(struct nf_conn *ct, unsigned char *data,36int get_h225_addr(struct nf_conn *ct, unsigned char *data,
34 TransportAddress *taddr, union nf_inet_addr *addr,37 TransportAddress *taddr, union nf_inet_addr *addr,
35 __be16 *port);38 __be16 *port);
include/linux/netfilter/nf_conntrack_h323_asn1.h+2−0
@@ -37,6 +37,8 @@ · 36 unmodified lines
37/*****************************************************************************37/*****************************************************************************
38 * H.323 Types38 * H.323 Types
39 ****************************************************************************/39 ****************************************************************************/
40
41#include <linux/types.h>
40#include <linux/netfilter/nf_conntrack_h323_types.h>42#include <linux/netfilter/nf_conntrack_h323_types.h>
41 43
42typedef struct {44typedef struct {
include/linux/netfilter/nf_conntrack_irc.h+4−0
@@ -4,6 +4,10 @@ · 3 unmodified lines
4 4
5#ifdef __KERNEL__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#define IRC_PORT 666711#define IRC_PORT 6667
8 12
9extern unsigned int (*nf_nat_irc_hook)(struct sk_buff *skb,13extern unsigned int (*nf_nat_irc_hook)(struct sk_buff *skb,
include/linux/netfilter/nf_conntrack_pptp.h+5−4
@@ -3,7 +3,12 @@ · 2 unmodified lines
3#ifndef _NF_CONNTRACK_PPTP_H3#ifndef _NF_CONNTRACK_PPTP_H
4#define _NF_CONNTRACK_PPTP_H4#define _NF_CONNTRACK_PPTP_H
5 5
6#include <linux/netfilter.h>
7#include <linux/skbuff.h>
8#include <linux/types.h>
6#include <linux/netfilter/nf_conntrack_common.h>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
8extern const char *const pptp_msg_name[];13extern const char *const pptp_msg_name[];
9 14
@@ -297,10 +302,6 @@ union pptp_ctrl_union { · 287 unmodified lines
297 struct PptpSetLinkInfo setlink;302 struct PptpSetLinkInfo setlink;
298};303};
299 304
300/* crap needed for nf_conntrack_compat.h */
301struct nf_conn;
302struct nf_conntrack_expect;
303
304extern int305extern int
305(*nf_nat_pptp_hook_outbound)(struct sk_buff *skb,306(*nf_nat_pptp_hook_outbound)(struct sk_buff *skb,
306 struct nf_conn *ct, enum ip_conntrack_info ctinfo,307 struct nf_conn *ct, enum ip_conntrack_info ctinfo,
include/linux/netfilter/nf_conntrack_sip.h+2−2
@@ -3,9 +3,9 @@ · 2 unmodified lines
3#define __NF_CONNTRACK_SIP_H__3#define __NF_CONNTRACK_SIP_H__
4#ifdef __KERNEL__4#ifdef __KERNEL__
5 5
6#include <net/netfilter/nf_conntrack_expect.h>6#include <linux/skbuff.h>
7
8#include <linux/types.h>7#include <linux/types.h>
8#include <net/netfilter/nf_conntrack_expect.h>
9 9
10#define SIP_PORT 506010#define SIP_PORT 5060
11#define SIP_TIMEOUT 360011#define SIP_TIMEOUT 3600
include/linux/netfilter/nf_conntrack_snmp.h+3−0
@@ -2,6 +2,9 @@ · 1 unmodified line
2#ifndef _NF_CONNTRACK_SNMP_H2#ifndef _NF_CONNTRACK_SNMP_H
3#define _NF_CONNTRACK_SNMP_H3#define _NF_CONNTRACK_SNMP_H
4 4
5#include <linux/netfilter.h>
6#include <linux/skbuff.h>
7
5extern int (*nf_nat_snmp_hook)(struct sk_buff *skb,8extern int (*nf_nat_snmp_hook)(struct sk_buff *skb,
6 unsigned int protoff,9 unsigned int protoff,
7 struct nf_conn *ct,10 struct nf_conn *ct,
include/linux/netfilter/nf_conntrack_tftp.h+5−0
@@ -4,6 +4,11 @@ · 3 unmodified lines
4 4
5#define TFTP_PORT 695#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
7struct tftphdr {12struct tftphdr {
8 __be16 opcode;13 __be16 opcode;
9};14};

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