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

netfilter: nat: remove nf_nat_l4proto.h 



after ipv4/6 nat tracker merge, there are no external callers, so
make last function static and remove the header.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 3bf195ae

include/net/netfilter/nf_nat_l4proto.h

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Header for use in defining a given protocol. */

#ifndef _NF_NAT_L4PROTO_H

#define _NF_NAT_L4PROTO_H

#include <net/netfilter/nf_nat.h>

#include <linux/netfilter/nfnetlink_conntrack.h>



struct nf_nat_l3proto;



/* Translate a packet to the target according to manip type.  Return on success. */

bool nf_nat_l4proto_manip_pkt(struct sk_buff *skb,

			      const struct nf_nat_l3proto *l3proto,

			      unsigned int iphdroff, unsigned int hdroff,

			      const struct nf_conntrack_tuple *tuple,

			      enum nf_nat_manip_type maniptype);

#endif /*_NF_NAT_L4PROTO_H*/

net/netfilter/nf_nat_helper.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <net/netfilter/nf_conntrack_seqadj.h>

#include <net/netfilter/nf_nat.h>

#include <net/netfilter/nf_nat_l3proto.h>

#include <net/netfilter/nf_nat_l4proto.h>

#include <net/netfilter/nf_nat_core.h>

#include <net/netfilter/nf_nat_helper.h>

net/netfilter/nf_nat_proto.c

+6 −9
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <net/netfilter/nf_nat.h>

#include <net/netfilter/nf_nat_core.h>

#include <net/netfilter/nf_nat_l3proto.h>

#include <net/netfilter/nf_nat_l4proto.h>



#include <linux/ipv6.h>

#include <linux/netfilter_ipv6.h>
@@ -34,6 +33,7 @@ 


#include <net/netfilter/nf_conntrack_core.h>

#include <net/netfilter/nf_conntrack.h>

#include <linux/netfilter/nfnetlink_conntrack.h>



static const struct nf_nat_l3proto nf_nat_l3proto_ipv4;

#if IS_ENABLED(CONFIG_IPV6)
@@ -320,7 +320,7 @@ gre_manip_pkt(struct sk_buff *skb, 
	return true;

}



bool nf_nat_l4proto_manip_pkt(struct sk_buff *skb,

static bool l4proto_manip_pkt(struct sk_buff *skb,

			      const struct nf_nat_l3proto *l3proto,

			      unsigned int iphdroff, unsigned int hdroff,

			      const struct nf_conntrack_tuple *tuple,
@@ -356,7 +356,6 @@ bool nf_nat_l4proto_manip_pkt(struct sk_buff *skb, 
	/* If we don't know protocol -- no error, pass it unmodified. */

	return true;

}

EXPORT_SYMBOL_GPL(nf_nat_l4proto_manip_pkt);



static bool nf_nat_ipv4_manip_pkt(struct sk_buff *skb,

				  unsigned int iphdroff,
@@ -372,7 +371,7 @@ static bool nf_nat_ipv4_manip_pkt(struct sk_buff *skb, 
	iph = (void *)skb->data + iphdroff;

	hdroff = iphdroff + iph->ihl * 4;



	if (!nf_nat_l4proto_manip_pkt(skb, &nf_nat_l3proto_ipv4, iphdroff,

	if (!l4proto_manip_pkt(skb, &nf_nat_l3proto_ipv4, iphdroff,

			       hdroff, target, maniptype))

		return false;

	iph = (void *)skb->data + iphdroff;
@@ -409,7 +408,7 @@ static bool nf_nat_ipv6_manip_pkt(struct sk_buff *skb, 
		goto manip_addr;



	if ((frag_off & htons(~0x7)) == 0 &&

	    !nf_nat_l4proto_manip_pkt(skb, &nf_nat_l3proto_ipv6, iphdroff, hdroff,

	    !l4proto_manip_pkt(skb, &nf_nat_l3proto_ipv6, iphdroff, hdroff,

			       target, maniptype))

		return false;
@@ -758,8 +757,6 @@ void nf_nat_l3proto_exit(void) 
}



#if IS_ENABLED(CONFIG_IPV6)

static const struct nf_nat_l3proto nf_nat_l3proto_ipv6;



static const struct nf_nat_l3proto nf_nat_l3proto_ipv6 = {

	.l3proto		= NFPROTO_IPV6,

	.manip_pkt		= nf_nat_ipv6_manip_pkt,