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

netfilter: nat: remove l4proto->manip_pkt 



This removes the last l4proto indirection, the two callers, the l3proto
packet mangling helpers for ipv4 and ipv6, now call the
nf_nat_l4proto_manip_pkt() helper.

nf_nat_proto_{dccp,tcp,sctp,gre,icmp,icmpv6} are left behind, even though
they contain no functionality anymore to not clutter this patch.

Next patch will remove the empty files and the nf_nat_l4proto
struct.

nf_nat_proto_udp.c is renamed to nf_nat_proto.c, as it now contains the
other nat manip functionality as well, not just udp and udplite.

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

include/net/netfilter/nf_nat_l4proto.h

+7 −8
Original line number Diff line number Diff line
@@ -12,14 +12,6 @@ struct nf_nat_l4proto { 
	/* Protocol number. */

	u8 l4proto;



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

	 * Return true if succeeded.

	 */

	bool (*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);

};



/* Protocol registration. */
@@ -29,6 +21,13 @@ void nf_nat_l4proto_unregister(u8 l3proto, 


const struct nf_nat_l4proto *__nf_nat_l4proto_find(u8 l3proto, u8 l4proto);



/* 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);



/* Built-in protocols. */

extern const struct nf_nat_l4proto nf_nat_l4proto_tcp;

extern const struct nf_nat_l4proto nf_nat_l4proto_udp;

net/ipv4/netfilter/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -156,15 +156,10 @@ config NF_NAT_SNMP_BASIC 


	  To compile it as a module, choose M here.  If unsure, say N.



config NF_NAT_PROTO_GRE

	tristate

	depends on NF_CT_PROTO_GRE



config NF_NAT_PPTP

	tristate

	depends on NF_CONNTRACK

	default NF_CONNTRACK_PPTP

	select NF_NAT_PROTO_GRE



config NF_NAT_H323

	tristate

net/ipv4/netfilter/nf_nat_l3proto_ipv4.c

+2 −2
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ static bool nf_nat_ipv4_manip_pkt(struct sk_buff *skb, 
	iph = (void *)skb->data + iphdroff;

	hdroff = iphdroff + iph->ihl * 4;



	if (!l4proto->manip_pkt(skb, &nf_nat_l3proto_ipv4, iphdroff, hdroff,

				target, maniptype))

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

				      hdroff, target, maniptype))

		return false;

	iph = (void *)skb->data + iphdroff;

net/ipv4/netfilter/nf_nat_pptp.c

+0 −2
Original line number Diff line number Diff line
@@ -299,8 +299,6 @@ pptp_inbound_pkt(struct sk_buff *skb, 


static int __init nf_nat_helper_pptp_init(void)

{

	nf_nat_need_gre();



	BUG_ON(nf_nat_pptp_hook_outbound != NULL);

	RCU_INIT_POINTER(nf_nat_pptp_hook_outbound, pptp_outbound_pkt);

net/ipv4/netfilter/nf_nat_proto_gre.c

+0 −41
Original line number Diff line number Diff line
@@ -37,49 +37,8 @@ MODULE_LICENSE("GPL"); 
MODULE_AUTHOR("Harald Welte <laforge@gnumonks.org>");

MODULE_DESCRIPTION("Netfilter NAT protocol helper module for GRE");



/* manipulate a GRE packet according to maniptype */

static bool

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

{

	const struct gre_base_hdr *greh;

	struct pptp_gre_header *pgreh;



	/* pgreh includes two optional 32bit fields which are not required

	 * to be there.  That's where the magic '8' comes from */

	if (!skb_make_writable(skb, hdroff + sizeof(*pgreh) - 8))

		return false;



	greh = (void *)skb->data + hdroff;

	pgreh = (struct pptp_gre_header *)greh;



	/* we only have destination manip of a packet, since 'source key'

	 * is not present in the packet itself */

	if (maniptype != NF_NAT_MANIP_DST)

		return true;



	switch (greh->flags & GRE_VERSION) {

	case GRE_VERSION_0:

		/* We do not currently NAT any GREv0 packets.

		 * Try to behave like "nf_nat_proto_unknown" */

		break;

	case GRE_VERSION_1:

		pr_debug("call_id -> 0x%04x\n", ntohs(tuple->dst.u.gre.key));

		pgreh->call_id = tuple->dst.u.gre.key;

		break;

	default:

		pr_debug("can't nat unknown GRE version\n");

		return false;

	}

	return true;

}



static const struct nf_nat_l4proto gre = {

	.l4proto		= IPPROTO_GRE,

	.manip_pkt		= gre_manip_pkt,

};



static int __init nf_nat_proto_gre_init(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE