tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[NETFILTER]: nf_nat: move NAT declarations from nf_conntrack_ipv4.h to nf_nat.h
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
authored by
Yasuyuki Kozakai
and committed by
David S. Miller
4ba88779
9f15c530
+21
-22
+1
-22
include/net/netfilter/ipv4/nf_conntrack_ipv4.h
+1
-22
include/net/netfilter/ipv4/nf_conntrack_ipv4.h
···
9
9
#ifndef _NF_CONNTRACK_IPV4_H
10
10
#define _NF_CONNTRACK_IPV4_H
11
11
12
-
#ifdef CONFIG_NF_NAT_NEEDED
13
-
#include <net/netfilter/nf_nat.h>
14
-
#include <linux/netfilter/nf_conntrack_pptp.h>
15
-
16
-
/* per conntrack: nat application helper private data */
17
-
union nf_conntrack_nat_help {
18
-
/* insert nat helper private data here */
19
-
struct nf_nat_pptp nat_pptp_info;
20
-
};
21
-
22
-
struct nf_conn_nat {
23
-
struct nf_nat_info info;
24
-
union nf_conntrack_nat_help help;
25
-
#if defined(CONFIG_IP_NF_TARGET_MASQUERADE) || \
26
-
defined(CONFIG_IP_NF_TARGET_MASQUERADE_MODULE)
27
-
int masq_index;
28
-
#endif
29
-
};
30
-
#endif /* CONFIG_NF_NAT_NEEDED */
31
-
32
12
/* Returns new sk_buff, or NULL */
33
-
struct sk_buff *
34
-
nf_ct_ipv4_ct_gather_frags(struct sk_buff *skb);
13
+
struct sk_buff *nf_ct_ipv4_ct_gather_frags(struct sk_buff *skb);
35
14
36
15
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4;
37
16
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4;
+1
include/net/netfilter/nf_conntrack.h
+1
include/net/netfilter/nf_conntrack.h
···
280
280
* nat: nf_conn .. nf_conn_nat, nf_conn .. nf_conn_nat .. nf_conn help
281
281
*/
282
282
#ifdef CONFIG_NF_NAT_NEEDED
283
+
#include <net/netfilter/nf_nat.h>
283
284
static inline struct nf_conn_nat *nfct_nat(const struct nf_conn *ct)
284
285
{
285
286
unsigned int offset = sizeof(struct nf_conn);
+18
include/net/netfilter/nf_nat.h
+18
include/net/netfilter/nf_nat.h
···
51
51
52
52
#ifdef __KERNEL__
53
53
#include <linux/list.h>
54
+
#include <linux/netfilter/nf_conntrack_pptp.h>
54
55
55
56
/* The structure embedded in the conntrack structure. */
56
57
struct nf_nat_info
57
58
{
58
59
struct list_head bysource;
59
60
struct nf_nat_seq seq[IP_CT_DIR_MAX];
61
+
};
62
+
63
+
/* per conntrack: nat application helper private data */
64
+
union nf_conntrack_nat_help
65
+
{
66
+
/* insert nat helper private data here */
67
+
struct nf_nat_pptp nat_pptp_info;
68
+
};
69
+
70
+
struct nf_conn_nat
71
+
{
72
+
struct nf_nat_info info;
73
+
union nf_conntrack_nat_help help;
74
+
#if defined(CONFIG_IP_NF_TARGET_MASQUERADE) || \
75
+
defined(CONFIG_IP_NF_TARGET_MASQUERADE_MODULE)
76
+
int masq_index;
77
+
#endif
60
78
};
61
79
62
80
struct nf_conn;
+1
include/net/netfilter/nf_nat_core.h
+1
include/net/netfilter/nf_nat_core.h