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

Commit 2eb0f624 authored by Thierry Du Tre's avatar Thierry Du Tre Committed by Pablo Neira Ayuso
Browse files

netfilter: add NAT support for shifted portmap ranges 



This is a patch proposal to support shifted ranges in portmaps.  (i.e. tcp/udp
incoming port 5000-5100 on WAN redirected to LAN 192.168.1.5:2000-2100)

Currently DNAT only works for single port or identical port ranges.  (i.e.
ports 5000-5100 on WAN interface redirected to a LAN host while original
destination port is not altered) When different port ranges are configured,
either 'random' mode should be used, or else all incoming connections are
mapped onto the first port in the redirect range. (in described example
WAN:5000-5100 will all be mapped to 192.168.1.5:2000)

This patch introduces a new mode indicated by flag NF_NAT_RANGE_PROTO_OFFSET
which uses a base port value to calculate an offset with the destination port
present in the incoming stream. That offset is then applied as index within the
redirect port range (index modulo rangewidth to handle range overflow).

In described example the base port would be 5000. An incoming stream with
destination port 5004 would result in an offset value 4 which means that the
NAT'ed stream will be using destination port 2004.

Other possibilities include deterministic mapping of larger or multiple ranges
to a smaller range : WAN:5000-5999 -> LAN:5000-5099 (maps WAN port 5*xx to port
51xx)

This patch does not change any current behavior. It just adds new NAT proto
range functionality which must be selected via the specific flag when intended
to use.

A patch for iptables (libipt_DNAT.c + libip6t_DNAT.c) will also be proposed
which makes this functionality immediately available.

Signed-off-by: default avatarThierry Du Tre <thierry@dtsystems.be>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 71cc0873

include/net/netfilter/ipv4/nf_nat_masquerade.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


unsigned int

nf_nat_masquerade_ipv4(struct sk_buff *skb, unsigned int hooknum,

		       const struct nf_nat_range *range,

		       const struct nf_nat_range2 *range,

		       const struct net_device *out);



void nf_nat_masquerade_ipv4_register_notifier(void);

include/net/netfilter/ipv6/nf_nat_masquerade.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#define _NF_NAT_MASQUERADE_IPV6_H_



unsigned int

nf_nat_masquerade_ipv6(struct sk_buff *skb, const struct nf_nat_range *range,

nf_nat_masquerade_ipv6(struct sk_buff *skb, const struct nf_nat_range2 *range,

		       const struct net_device *out);

void nf_nat_masquerade_ipv6_register_notifier(void);

void nf_nat_masquerade_ipv6_unregister_notifier(void);

include/net/netfilter/nf_nat.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct nf_conn_nat { 


/* Set up the info structure to map into this range. */

unsigned int nf_nat_setup_info(struct nf_conn *ct,

			       const struct nf_nat_range *range,

			       const struct nf_nat_range2 *range,

			       enum nf_nat_manip_type maniptype);



extern unsigned int nf_nat_alloc_null_binding(struct nf_conn *ct,

include/net/netfilter/nf_nat_l3proto.h

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ struct nf_nat_l3proto { 
	u8	l3proto;



	bool	(*in_range)(const struct nf_conntrack_tuple *t,

			    const struct nf_nat_range *range);

			    const struct nf_nat_range2 *range);



	u32 	(*secure_port)(const struct nf_conntrack_tuple *t, __be16);
@@ -33,7 +33,7 @@ struct nf_nat_l3proto { 
				  struct flowi *fl);



	int	(*nlattr_to_range)(struct nlattr *tb[],

				   struct nf_nat_range *range);

				   struct nf_nat_range2 *range);

};



int nf_nat_l3proto_register(const struct nf_nat_l3proto *);

include/net/netfilter/nf_nat_l4proto.h

+4 −4
Original line number Diff line number Diff line
@@ -34,12 +34,12 @@ struct nf_nat_l4proto { 
	 */

	void (*unique_tuple)(const struct nf_nat_l3proto *l3proto,

			     struct nf_conntrack_tuple *tuple,

			     const struct nf_nat_range *range,

			     const struct nf_nat_range2 *range,

			     enum nf_nat_manip_type maniptype,

			     const struct nf_conn *ct);



	int (*nlattr_to_range)(struct nlattr *tb[],

			       struct nf_nat_range *range);

			       struct nf_nat_range2 *range);

};



/* Protocol registration. */
@@ -72,11 +72,11 @@ bool nf_nat_l4proto_in_range(const struct nf_conntrack_tuple *tuple, 


void nf_nat_l4proto_unique_tuple(const struct nf_nat_l3proto *l3proto,

				 struct nf_conntrack_tuple *tuple,

				 const struct nf_nat_range *range,

				 const struct nf_nat_range2 *range,

				 enum nf_nat_manip_type maniptype,

				 const struct nf_conn *ct, u16 *rover);



int nf_nat_l4proto_nlattr_to_range(struct nlattr *tb[],

				   struct nf_nat_range *range);

				   struct nf_nat_range2 *range);



#endif /*_NF_NAT_L4PROTO_H*/