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

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

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

include/net/netfilter/nf_nat.h

+39 −0
Original line number Diff line number Diff line
@@ -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);

void nf_nat_unregister_fn(struct net *net, const struct nf_hook_ops *ops,

			  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

include/net/netfilter/nf_nat_core.h

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/* 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

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
/* 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

+3 −5
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
#include <net/ip.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);
@@ -70,10 +68,10 @@ static int ipt_nat_register_lookups(struct net *net) 
	int i, ret;



	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) {

			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;

		}
@@ -87,7 +85,7 @@ static void ipt_nat_unregister_lookups(struct net *net) 
	int 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)

net/ipv4/netfilter/nft_chain_nat_ipv4.c

+2 −4
Original line number Diff line number Diff line
@@ -20,10 +20,8 @@ 
#include <linux/netfilter/nf_tables.h>

#include <net/netfilter/nf_conntrack.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_ipv4.h>

#include <net/netfilter/nf_nat_l3proto.h>

#include <net/ip.h>



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)

{

	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)

{

	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 = {