Skip to content

L
linux
Commit d2c5c103 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files
Options

netfilter: nat: remove nf_nat_l3proto.h and nf_nat_core.h 

The l3proto name is gone, its header file is the last trace.
While at it, also remove nf_nat_core.h, its very small and all users
include nf_nat.h too.

before:
   text    data     bss     dec     hex filename
  22948    1612    4136   28696    7018 nf_nat.ko

after removal of l3proto register/unregister functions:
   text	   data	    bss	    dec	    hex	filename
  22196	   1516	   4136	  27848	   6cc8 nf_nat.ko

checkpatch complains about overly long lines, but line breaks
do not make things more readable and the line length gets smaller
here, not larger.
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent d6c4c8ff
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 95 deletions
include/net/netfilter/nf_nat.h
View file @ d2c5c103
...@@ -73,4 +73,43 @@ int nf_nat_register_fn(struct net *net, const struct nf_hook_ops *ops, ...@@ -73,4 +73,43 @@ int nf_nat_register_fn(struct net *net, const struct nf_hook_ops *ops,
const struct nf_hook_ops *nat_ops, unsigned int ops_count); const struct nf_hook_ops *nat_ops, unsigned int ops_count);
void nf_nat_unregister_fn(struct net *net, const struct nf_hook_ops *ops, void nf_nat_unregister_fn(struct net *net, const struct nf_hook_ops *ops,
unsigned int ops_count); unsigned int ops_count);
unsigned int nf_nat_packet(struct nf_conn *ct, enum ip_conntrack_info ctinfo,
unsigned int hooknum, struct sk_buff *skb);
unsigned int nf_nat_manip_pkt(struct sk_buff *skb, struct nf_conn *ct,
enum nf_nat_manip_type mtype,
enum ip_conntrack_dir dir);
void nf_nat_csum_recalc(struct sk_buff *skb,
u8 nfproto, u8 proto, void *data, __sum16 *check,
int datalen, int oldlen);
int nf_nat_icmp_reply_translation(struct sk_buff *skb, struct nf_conn *ct,
enum ip_conntrack_info ctinfo,
unsigned int hooknum);
int nf_nat_icmpv6_reply_translation(struct sk_buff *skb, struct nf_conn *ct,
enum ip_conntrack_info ctinfo,
unsigned int hooknum, unsigned int hdrlen);
int nf_nat_ipv4_register_fn(struct net *net, const struct nf_hook_ops *ops);
void nf_nat_ipv4_unregister_fn(struct net *net, const struct nf_hook_ops *ops);
int nf_nat_ipv6_register_fn(struct net *net, const struct nf_hook_ops *ops);
void nf_nat_ipv6_unregister_fn(struct net *net, const struct nf_hook_ops *ops);
unsigned int
nf_nat_inet_fn(void *priv, struct sk_buff *skb,
const struct nf_hook_state *state);
int nf_xfrm_me_harder(struct net *n, struct sk_buff *s, unsigned int family);
static inline int nf_nat_initialized(struct nf_conn *ct,
enum nf_nat_manip_type manip)
{
if (manip == NF_NAT_MANIP_SRC)
return ct->status & IPS_SRC_NAT_DONE;
else
return ct->status & IPS_DST_NAT_DONE;
}
#endif #endif
include/net/netfilter/nf_nat_core.h deleted 100644 → 0
View file @ d6c4c8ff
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _NF_NAT_CORE_H
#define _NF_NAT_CORE_H
#include <linux/list.h>
#include <net/netfilter/nf_conntrack.h>
#include <net/netfilter/nf_nat.h>
/* This header used to share core functionality between the standalone
NAT module, and the compatibility layer's use of NAT for masquerading. */
unsigned int nf_nat_packet(struct nf_conn *ct, enum ip_conntrack_info ctinfo,
unsigned int hooknum, struct sk_buff *skb);
unsigned int
nf_nat_inet_fn(void *priv, struct sk_buff *skb,
const struct nf_hook_state *state);
int nf_xfrm_me_harder(struct net *net, struct sk_buff *skb, unsigned int family);
static inline int nf_nat_initialized(struct nf_conn *ct,
enum nf_nat_manip_type manip)
{
if (manip == NF_NAT_MANIP_SRC)
return ct->status & IPS_SRC_NAT_DONE;
else
return ct->status & IPS_DST_NAT_DONE;
}
#endif /* _NF_NAT_CORE_H */
include/net/netfilter/nf_nat_l3proto.h deleted 100644 → 0
View file @ d6c4c8ff
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _NF_NAT_L3PROTO_H
#define _NF_NAT_L3PROTO_H
unsigned int nf_nat_manip_pkt(struct sk_buff *skb, struct nf_conn *ct,
enum nf_nat_manip_type mtype,
enum ip_conntrack_dir dir);
void nf_nat_csum_recalc(struct sk_buff *skb,
u8 nfproto, u8 proto, void *data, __sum16 *check,
int datalen, int oldlen);
int nf_nat_icmp_reply_translation(struct sk_buff *skb, struct nf_conn *ct,
enum ip_conntrack_info ctinfo,
unsigned int hooknum);
int nf_nat_icmpv6_reply_translation(struct sk_buff *skb, struct nf_conn *ct,
enum ip_conntrack_info ctinfo,
unsigned int hooknum, unsigned int hdrlen);
int nf_nat_l3proto_ipv4_register_fn(struct net *net, const struct nf_hook_ops *ops);
void nf_nat_l3proto_ipv4_unregister_fn(struct net *net, const struct nf_hook_ops *ops);
int nf_nat_l3proto_ipv6_register_fn(struct net *net, const struct nf_hook_ops *ops);
void nf_nat_l3proto_ipv6_unregister_fn(struct net *net, const struct nf_hook_ops *ops);
#endif /* _NF_NAT_L3PROTO_H */
net/ipv4/netfilter/iptable_nat.c
View file @ d2c5c103
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
#include <net/ip.h> #include <net/ip.h>
#include <net/netfilter/nf_nat.h> #include <net/netfilter/nf_nat.h>
#include <net/netfilter/nf_nat_core.h>
#include <net/netfilter/nf_nat_l3proto.h>
static int __net_init iptable_nat_table_init(struct net *net); static int __net_init iptable_nat_table_init(struct net *net);
...@@ -70,10 +68,10 @@ static int ipt_nat_register_lookups(struct net *net) ...@@ -70,10 +68,10 @@ static int ipt_nat_register_lookups(struct net *net)
int i, ret; int i, ret;
for (i = 0; i < ARRAY_SIZE(nf_nat_ipv4_ops); i++) { for (i = 0; i < ARRAY_SIZE(nf_nat_ipv4_ops); i++) {
ret = nf_nat_l3proto_ipv4_register_fn(net, &nf_nat_ipv4_ops[i]); ret = nf_nat_ipv4_register_fn(net, &nf_nat_ipv4_ops[i]);
if (ret) { if (ret) {
while (i) while (i)
nf_nat_l3proto_ipv4_unregister_fn(net, &nf_nat_ipv4_ops[--i]); nf_nat_ipv4_unregister_fn(net, &nf_nat_ipv4_ops[--i]);
return ret; return ret;
} }
...@@ -87,7 +85,7 @@ static void ipt_nat_unregister_lookups(struct net *net) ...@@ -87,7 +85,7 @@ static void ipt_nat_unregister_lookups(struct net *net)
int i; int i;
for (i = 0; i < ARRAY_SIZE(nf_nat_ipv4_ops); i++) for (i = 0; i < ARRAY_SIZE(nf_nat_ipv4_ops); i++)
nf_nat_l3proto_ipv4_unregister_fn(net, &nf_nat_ipv4_ops[i]); nf_nat_ipv4_unregister_fn(net, &nf_nat_ipv4_ops[i]);
} }
static int __net_init iptable_nat_table_init(struct net *net) static int __net_init iptable_nat_table_init(struct net *net)
......
net/ipv4/netfilter/nft_chain_nat_ipv4.c
View file @ d2c5c103
...@@ -20,10 +20,8 @@ ...@@ -20,10 +20,8 @@
#include <linux/netfilter/nf_tables.h> #include <linux/netfilter/nf_tables.h>
#include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack.h>
#include <net/netfilter/nf_nat.h> #include <net/netfilter/nf_nat.h>
#include <net/netfilter/nf_nat_core.h>
#include <net/netfilter/nf_tables.h> #include <net/netfilter/nf_tables.h>
#include <net/netfilter/nf_tables_ipv4.h> #include <net/netfilter/nf_tables_ipv4.h>
#include <net/netfilter/nf_nat_l3proto.h>
#include <net/ip.h> #include <net/ip.h>
static unsigned int nft_nat_do_chain(void *priv, static unsigned int nft_nat_do_chain(void *priv,
...@@ -40,12 +38,12 @@ static unsigned int nft_nat_do_chain(void *priv, ...@@ -40,12 +38,12 @@ static unsigned int nft_nat_do_chain(void *priv,
static int nft_nat_ipv4_reg(struct net *net, const struct nf_hook_ops *ops) static int nft_nat_ipv4_reg(struct net *net, const struct nf_hook_ops *ops)
{ {
return nf_nat_l3proto_ipv4_register_fn(net, ops); return nf_nat_ipv4_register_fn(net, ops);
} }
static void nft_nat_ipv4_unreg(struct net *net, const struct nf_hook_ops *ops) static void nft_nat_ipv4_unreg(struct net *net, const struct nf_hook_ops *ops)
{ {
nf_nat_l3proto_ipv4_unregister_fn(net, ops); nf_nat_ipv4_unregister_fn(net, ops);
} }
static const struct nft_chain_type nft_chain_nat_ipv4 = { static const struct nft_chain_type nft_chain_nat_ipv4 = {
......
net/ipv6/netfilter/ip6table_nat.c
View file @ d2c5c103
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
#include <net/ipv6.h> #include <net/ipv6.h>
#include <net/netfilter/nf_nat.h> #include <net/netfilter/nf_nat.h>
#include <net/netfilter/nf_nat_core.h>
#include <net/netfilter/nf_nat_l3proto.h>
static int __net_init ip6table_nat_table_init(struct net *net); static int __net_init ip6table_nat_table_init(struct net *net);
...@@ -72,10 +70,10 @@ static int ip6t_nat_register_lookups(struct net *net) ...@@ -72,10 +70,10 @@ static int ip6t_nat_register_lookups(struct net *net)
int i, ret; int i, ret;
for (i = 0; i < ARRAY_SIZE(nf_nat_ipv6_ops); i++) { for (i = 0; i < ARRAY_SIZE(nf_nat_ipv6_ops); i++) {
ret = nf_nat_l3proto_ipv6_register_fn(net, &nf_nat_ipv6_ops[i]); ret = nf_nat_ipv6_register_fn(net, &nf_nat_ipv6_ops[i]);
if (ret) { if (ret) {
while (i) while (i)
nf_nat_l3proto_ipv6_unregister_fn(net, &nf_nat_ipv6_ops[--i]); nf_nat_ipv6_unregister_fn(net, &nf_nat_ipv6_ops[--i]);
return ret; return ret;
} }
...@@ -89,7 +87,7 @@ static void ip6t_nat_unregister_lookups(struct net *net) ...@@ -89,7 +87,7 @@ static void ip6t_nat_unregister_lookups(struct net *net)
int i; int i;
for (i = 0; i < ARRAY_SIZE(nf_nat_ipv6_ops); i++) for (i = 0; i < ARRAY_SIZE(nf_nat_ipv6_ops); i++)
nf_nat_l3proto_ipv6_unregister_fn(net, &nf_nat_ipv6_ops[i]); nf_nat_ipv6_unregister_fn(net, &nf_nat_ipv6_ops[i]);
} }
static int __net_init ip6table_nat_table_init(struct net *net) static int __net_init ip6table_nat_table_init(struct net *net)
......
net/ipv6/netfilter/nft_chain_nat_ipv6.c
View file @ d2c5c103
...@@ -18,10 +18,8 @@ ...@@ -18,10 +18,8 @@
#include <linux/netfilter/nf_tables.h> #include <linux/netfilter/nf_tables.h>
#include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack.h>
#include <net/netfilter/nf_nat.h> #include <net/netfilter/nf_nat.h>
#include <net/netfilter/nf_nat_core.h>
#include <net/netfilter/nf_tables.h> #include <net/netfilter/nf_tables.h>
#include <net/netfilter/nf_tables_ipv6.h> #include <net/netfilter/nf_tables_ipv6.h>
#include <net/netfilter/nf_nat_l3proto.h>
#include <net/ipv6.h> #include <net/ipv6.h>
static unsigned int nft_nat_do_chain(void *priv, static unsigned int nft_nat_do_chain(void *priv,
...@@ -38,12 +36,12 @@ static unsigned int nft_nat_do_chain(void *priv, ...@@ -38,12 +36,12 @@ static unsigned int nft_nat_do_chain(void *priv,
static int nft_nat_ipv6_reg(struct net *net, const struct nf_hook_ops *ops) static int nft_nat_ipv6_reg(struct net *net, const struct nf_hook_ops *ops)
{ {
return nf_nat_l3proto_ipv6_register_fn(net, ops); return nf_nat_ipv6_register_fn(net, ops);
} }
static void nft_nat_ipv6_unreg(struct net *net, const struct nf_hook_ops *ops) static void nft_nat_ipv6_unreg(struct net *net, const struct nf_hook_ops *ops)
{ {
nf_nat_l3proto_ipv6_unregister_fn(net, ops); nf_nat_ipv6_unregister_fn(net, ops);
} }
static const struct nft_chain_type nft_chain_nat_ipv6 = { static const struct nft_chain_type nft_chain_nat_ipv6 = {
......
net/netfilter/nf_conntrack_core.c
View file @ d2c5c103
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
#include <net/netfilter/nf_conntrack_labels.h> #include <net/netfilter/nf_conntrack_labels.h>
#include <net/netfilter/nf_conntrack_synproxy.h> #include <net/netfilter/nf_conntrack_synproxy.h>
#include <net/netfilter/nf_nat.h> #include <net/netfilter/nf_nat.h>
#include <net/netfilter/nf_nat_core.h>
#include <net/netfilter/nf_nat_helper.h> #include <net/netfilter/nf_nat_helper.h>
#include <net/netns/hash.h> #include <net/netns/hash.h>
#include <net/ip.h> #include <net/ip.h>
......
net/netfilter/nf_conntrack_netlink.c
View file @ d2c5c103
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include <net/netfilter/nf_conntrack_labels.h> #include <net/netfilter/nf_conntrack_labels.h>
#include <net/netfilter/nf_conntrack_synproxy.h> #include <net/netfilter/nf_conntrack_synproxy.h>
#ifdef CONFIG_NF_NAT_NEEDED #ifdef CONFIG_NF_NAT_NEEDED
#include <net/netfilter/nf_nat_core.h> #include <net/netfilter/nf_nat.h>
#include <net/netfilter/nf_nat_helper.h> #include <net/netfilter/nf_nat_helper.h>
#endif #endif
......
net/netfilter/nf_nat_core.c
View file @ d2c5c103
...@@ -22,8 +22,6 @@ ...@@ -22,8 +22,6 @@
#include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack.h>
#include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack_core.h>
#include <net/netfilter/nf_nat.h> #include <net/netfilter/nf_nat.h>
#include <net/netfilter/nf_nat_l3proto.h>
#include <net/netfilter/nf_nat_core.h>
#include <net/netfilter/nf_nat_helper.h> #include <net/netfilter/nf_nat_helper.h>
#include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/nf_conntrack_helper.h>
#include <net/netfilter/nf_conntrack_seqadj.h> #include <net/netfilter/nf_conntrack_seqadj.h>
......
net/netfilter/nf_nat_helper.c
View file @ d2c5c103
...@@ -22,8 +22,6 @@ ...@@ -22,8 +22,6 @@
#include <net/netfilter/nf_conntrack_expect.h> #include <net/netfilter/nf_conntrack_expect.h>
#include <net/netfilter/nf_conntrack_seqadj.h> #include <net/netfilter/nf_conntrack_seqadj.h>
#include <net/netfilter/nf_nat.h> #include <net/netfilter/nf_nat.h>
#include <net/netfilter/nf_nat_l3proto.h>
#include <net/netfilter/nf_nat_core.h>
#include <net/netfilter/nf_nat_helper.h> #include <net/netfilter/nf_nat_helper.h>
/* Frobs data inside this packet, which is linear. */ /* Frobs data inside this packet, which is linear. */
......
net/netfilter/nf_nat_proto.c
View file @ d2c5c103
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#include <linux/netfilter.h> #include <linux/netfilter.h>
#include <net/netfilter/nf_nat.h> #include <net/netfilter/nf_nat.h>
#include <net/netfilter/nf_nat_core.h>
#include <net/netfilter/nf_nat_l3proto.h>
#include <linux/ipv6.h> #include <linux/ipv6.h>
#include <linux/netfilter_ipv6.h> #include <linux/netfilter_ipv6.h>
...@@ -758,17 +756,17 @@ static const struct nf_hook_ops nf_nat_ipv4_ops[] = { ...@@ -758,17 +756,17 @@ static const struct nf_hook_ops nf_nat_ipv4_ops[] = {
}, },
}; };
int nf_nat_l3proto_ipv4_register_fn(struct net *net, const struct nf_hook_ops *ops) int nf_nat_ipv4_register_fn(struct net *net, const struct nf_hook_ops *ops)
{ {
return nf_nat_register_fn(net, ops, nf_nat_ipv4_ops, ARRAY_SIZE(nf_nat_ipv4_ops)); return nf_nat_register_fn(net, ops, nf_nat_ipv4_ops, ARRAY_SIZE(nf_nat_ipv4_ops));
} }
EXPORT_SYMBOL_GPL(nf_nat_l3proto_ipv4_register_fn); EXPORT_SYMBOL_GPL(nf_nat_ipv4_register_fn);
void nf_nat_l3proto_ipv4_unregister_fn(struct net *net, const struct nf_hook_ops *ops) void nf_nat_ipv4_unregister_fn(struct net *net, const struct nf_hook_ops *ops)
{ {
nf_nat_unregister_fn(net, ops, ARRAY_SIZE(nf_nat_ipv4_ops)); nf_nat_unregister_fn(net, ops, ARRAY_SIZE(nf_nat_ipv4_ops));
} }
EXPORT_SYMBOL_GPL(nf_nat_l3proto_ipv4_unregister_fn); EXPORT_SYMBOL_GPL(nf_nat_ipv4_unregister_fn);
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
int nf_nat_icmpv6_reply_translation(struct sk_buff *skb, int nf_nat_icmpv6_reply_translation(struct sk_buff *skb,
...@@ -1010,16 +1008,16 @@ static const struct nf_hook_ops nf_nat_ipv6_ops[] = { ...@@ -1010,16 +1008,16 @@ static const struct nf_hook_ops nf_nat_ipv6_ops[] = {
}, },
}; };
int nf_nat_l3proto_ipv6_register_fn(struct net *net, const struct nf_hook_ops *ops) int nf_nat_ipv6_register_fn(struct net *net, const struct nf_hook_ops *ops)
{ {
return nf_nat_register_fn(net, ops, nf_nat_ipv6_ops, return nf_nat_register_fn(net, ops, nf_nat_ipv6_ops,
ARRAY_SIZE(nf_nat_ipv6_ops)); ARRAY_SIZE(nf_nat_ipv6_ops));
} }
EXPORT_SYMBOL_GPL(nf_nat_l3proto_ipv6_register_fn); EXPORT_SYMBOL_GPL(nf_nat_ipv6_register_fn);
void nf_nat_l3proto_ipv6_unregister_fn(struct net *net, const struct nf_hook_ops *ops) void nf_nat_ipv6_unregister_fn(struct net *net, const struct nf_hook_ops *ops)
{ {
nf_nat_unregister_fn(net, ops, ARRAY_SIZE(nf_nat_ipv6_ops)); nf_nat_unregister_fn(net, ops, ARRAY_SIZE(nf_nat_ipv6_ops));
} }
EXPORT_SYMBOL_GPL(nf_nat_l3proto_ipv6_unregister_fn); EXPORT_SYMBOL_GPL(nf_nat_ipv6_unregister_fn);
#endif /* CONFIG_IPV6 */ #endif /* CONFIG_IPV6 */
net/netfilter/nft_nat.c
View file @ d2c5c103
...@@ -21,9 +21,7 @@ ...@@ -21,9 +21,7 @@
#include <linux/netfilter/nf_tables.h> #include <linux/netfilter/nf_tables.h>
#include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack.h>
#include <net/netfilter/nf_nat.h> #include <net/netfilter/nf_nat.h>
#include <net/netfilter/nf_nat_core.h>
#include <net/netfilter/nf_tables.h> #include <net/netfilter/nf_tables.h>
#include <net/netfilter/nf_nat_l3proto.h>
#include <net/ip.h> #include <net/ip.h>
struct nft_nat { struct nft_nat {
......
net/netfilter/xt_nat.c
View file @ d2c5c103
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/netfilter.h> #include <linux/netfilter.h>
#include <linux/netfilter/x_tables.h> #include <linux/netfilter/x_tables.h>
#include <net/netfilter/nf_nat_core.h> #include <net/netfilter/nf_nat.h>
static int xt_nat_checkentry_v0(const struct xt_tgchk_param *par) static int xt_nat_checkentry_v0(const struct xt_tgchk_param *par)
{ {
......
net/openvswitch/conntrack.c
View file @ d2c5c103
...@@ -29,9 +29,7 @@ ...@@ -29,9 +29,7 @@
#include <net/ipv6_frag.h> #include <net/ipv6_frag.h>
#ifdef CONFIG_NF_NAT_NEEDED #ifdef CONFIG_NF_NAT_NEEDED
#include <linux/netfilter/nf_nat.h> #include <net/netfilter/nf_nat.h>
#include <net/netfilter/nf_nat_core.h>
#include <net/netfilter/nf_nat_l3proto.h>
#endif #endif
#include "datapath.h" #include "datapath.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7