[v2] netfilter : add NAT support for shifted portmap ranges

Message ID 728b1f75-3f1b-c137-b2ca-8e0d50c07bce@dtsystems.be
State Changes Requested
Delegated to: Pablo Neira
Headers show
Series
  • [v2] netfilter : add NAT support for shifted portmap ranges
Related show

Commit Message

Thierry Du Tre Jan. 11, 2018, 6:42 p.m.
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) 
will also 
be 
proposed 
which 
makes 
this functionality immediately available. 


Signed-off-by: Thierry Du Tre 
<thierry@dtsystems.be>

---
Changes in v2:
	- added new revision for SNAT and DNAT targets to support the new base port variable in struct nf_nat_range2
	- replaced all occurences of struct nf_nat_range with struct nf_nat_range2

  include/net/netfilter/ipv4/nf_nat_masquerade.h |  2 +-
  include/net/netfilter/ipv6/nf_nat_masquerade.h |  2 +-
  include/net/netfilter/nf_nat.h                 |  2 +-
  include/net/netfilter/nf_nat_l3proto.h         |  4 +-
  include/net/netfilter/nf_nat_l4proto.h         |  8 +--
  include/net/netfilter/nf_nat_redirect.h        |  2 +-
  include/uapi/linux/netfilter/nf_nat.h          | 12 ++++-
  net/ipv4/netfilter/ipt_MASQUERADE.c            |  2 +-
  net/ipv4/netfilter/nf_nat_h323.c               |  4 +-
  net/ipv4/netfilter/nf_nat_l3proto_ipv4.c       |  4 +-
  net/ipv4/netfilter/nf_nat_masquerade_ipv4.c    |  4 +-
  net/ipv4/netfilter/nf_nat_pptp.c               |  2 +-
  net/ipv4/netfilter/nf_nat_proto_gre.c          |  2 +-
  net/ipv4/netfilter/nf_nat_proto_icmp.c         |  2 +-
  net/ipv4/netfilter/nft_masq_ipv4.c             |  2 +-
  net/ipv6/netfilter/ip6t_MASQUERADE.c           |  2 +-
  net/ipv6/netfilter/nf_nat_l3proto_ipv6.c       |  4 +-
  net/ipv6/netfilter/nf_nat_masquerade_ipv6.c    |  4 +-
  net/ipv6/netfilter/nf_nat_proto_icmpv6.c       |  2 +-
  net/ipv6/netfilter/nft_masq_ipv6.c             |  2 +-
  net/ipv6/netfilter/nft_redir_ipv6.c            |  2 +-
  net/netfilter/nf_nat_core.c                    | 27 +++++-----
  net/netfilter/nf_nat_helper.c                  |  2 +-
  net/netfilter/nf_nat_proto_common.c            |  9 ++--
  net/netfilter/nf_nat_proto_dccp.c              |  2 +-
  net/netfilter/nf_nat_proto_sctp.c              |  2 +-
  net/netfilter/nf_nat_proto_tcp.c               |  2 +-
  net/netfilter/nf_nat_proto_udp.c               |  4 +-
  net/netfilter/nf_nat_proto_unknown.c           |  2 +-
  net/netfilter/nf_nat_redirect.c                |  6 +--
  net/netfilter/nf_nat_sip.c                     |  2 +-
  net/netfilter/nft_nat.c                        |  2 +-
  net/netfilter/xt_NETMAP.c                      |  8 +--
  net/netfilter/xt_REDIRECT.c                    |  2 +-
  net/netfilter/xt_nat.c                         | 72 +++++++++++++++++++++++---
  35 files changed, 143 insertions(+), 69 deletions(-)

Comments

Pablo Neira Ayuso Jan. 12, 2018, 12:21 a.m. | #1
Hi Thierry,

On Thu, Jan 11, 2018 at 07:42:27PM +0100, Thierry Du Tre wrote:
> 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) will also be proposed which makes this
> functionality immediately available.
> 
> 
> Signed-off-by: Thierry Du Tre <thierry@dtsystems.be>
> 
> ---
> Changes in v2:
> 	- added new revision for SNAT and DNAT targets to support the new base port variable in struct nf_nat_range2
> 	- replaced all occurences of struct nf_nat_range with struct nf_nat_range2
> 
>  include/net/netfilter/ipv4/nf_nat_masquerade.h |  2 +-
>  include/net/netfilter/ipv6/nf_nat_masquerade.h |  2 +-
>  include/net/netfilter/nf_nat.h                 |  2 +-
>  include/net/netfilter/nf_nat_l3proto.h         |  4 +-
>  include/net/netfilter/nf_nat_l4proto.h         |  8 +--
>  include/net/netfilter/nf_nat_redirect.h        |  2 +-
>  include/uapi/linux/netfilter/nf_nat.h          | 12 ++++-
>  net/ipv4/netfilter/ipt_MASQUERADE.c            |  2 +-
>  net/ipv4/netfilter/nf_nat_h323.c               |  4 +-
>  net/ipv4/netfilter/nf_nat_l3proto_ipv4.c       |  4 +-
>  net/ipv4/netfilter/nf_nat_masquerade_ipv4.c    |  4 +-
>  net/ipv4/netfilter/nf_nat_pptp.c               |  2 +-
>  net/ipv4/netfilter/nf_nat_proto_gre.c          |  2 +-
>  net/ipv4/netfilter/nf_nat_proto_icmp.c         |  2 +-
>  net/ipv4/netfilter/nft_masq_ipv4.c             |  2 +-
>  net/ipv6/netfilter/ip6t_MASQUERADE.c           |  2 +-
>  net/ipv6/netfilter/nf_nat_l3proto_ipv6.c       |  4 +-
>  net/ipv6/netfilter/nf_nat_masquerade_ipv6.c    |  4 +-
>  net/ipv6/netfilter/nf_nat_proto_icmpv6.c       |  2 +-
>  net/ipv6/netfilter/nft_masq_ipv6.c             |  2 +-
>  net/ipv6/netfilter/nft_redir_ipv6.c            |  2 +-
>  net/netfilter/nf_nat_core.c                    | 27 +++++-----
>  net/netfilter/nf_nat_helper.c                  |  2 +-
>  net/netfilter/nf_nat_proto_common.c            |  9 ++--
>  net/netfilter/nf_nat_proto_dccp.c              |  2 +-
>  net/netfilter/nf_nat_proto_sctp.c              |  2 +-
>  net/netfilter/nf_nat_proto_tcp.c               |  2 +-
>  net/netfilter/nf_nat_proto_udp.c               |  4 +-
>  net/netfilter/nf_nat_proto_unknown.c           |  2 +-
>  net/netfilter/nf_nat_redirect.c                |  6 +--
>  net/netfilter/nf_nat_sip.c                     |  2 +-
>  net/netfilter/nft_nat.c                        |  2 +-
>  net/netfilter/xt_NETMAP.c                      |  8 +--
>  net/netfilter/xt_REDIRECT.c                    |  2 +-
>  net/netfilter/xt_nat.c                         | 72 +++++++++++++++++++++++---
>  35 files changed, 143 insertions(+), 69 deletions(-)
> 
> diff --git a/include/net/netfilter/ipv4/nf_nat_masquerade.h b/include/net/netfilter/ipv4/nf_nat_masquerade.h
> index ebd8694..cd24be4 100644
> --- a/include/net/netfilter/ipv4/nf_nat_masquerade.h
> +++ b/include/net/netfilter/ipv4/nf_nat_masquerade.h
> @@ -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);

I think you can get a much smaller patch if you rename the existing
"struct nf_nat_range" to "struct nf_nat_range_old", then the idea is
to dump the old representation into the new one, something like:

        struct nf_nat_range range = {};

        memcpy(&range, range_old, sizeof(range_old));
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Thierry Du Tre Jan. 12, 2018, 10:21 a.m. | #2
Hi Pablo, thanks for you quick response.

Op 12/01/2018 om 1:21 schreef Pablo Neira Ayuso:
> Hi Thierry,
> 
> On Thu, Jan 11, 2018 at 07:42:27PM +0100, Thierry Du Tre wrote:
>> This is a patch proposal to support shifted ranges in portmaps.
> 
> I think you can get a much smaller patch if you rename the existing
> "struct nf_nat_range" to "struct nf_nat_range_old", then the idea is
> to dump the old representation into the new one, something like:
> 
>          struct nf_nat_range range = {};
> 
>          memcpy(&range, range_old, sizeof(range_old));

I did think about this but then checked other xt modules with multiple revisions :
xt_hashlimit.c - struct xt_hashlimit_mtinfo3
xt_conntrack.c - struct xt_conntrack_mtinfo3
xt_mark.c - struct xt_mark_tginfo2

But you prefer changing uapi/linux/netfilter/nf_nat.h with something like this ?

+struct nf_nat_range1 {
+       unsigned int                    flags;
+       union nf_inet_addr              min_addr;
+       union nf_inet_addr              max_addr;
+       union nf_conntrack_man_proto    min_proto;
+       union nf_conntrack_man_proto    max_proto;
+};
+
 struct nf_nat_range {
        unsigned int                    flags;
        union nf_inet_addr              min_addr;
        union nf_inet_addr              max_addr;
        union nf_conntrack_man_proto    min_proto;
        union nf_conntrack_man_proto    max_proto;
+       union nf_conntrack_man_proto    base_proto;
 };

In your reply to my first patch proposal you mentioned the backwards compatibility problem regarding userspace applications.
The new revisions for SNAT and DNAT target do keep ABI constant, but changing the current nf_nat_range definition will impact API (although it won't trigger any compile errors because new nf_nat_range is a simple superset of the current definition).
Is that ok for you then ?
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/include/net/netfilter/ipv4/nf_nat_masquerade.h b/include/net/netfilter/ipv4/nf_nat_masquerade.h
index ebd8694..cd24be4 100644
--- a/include/net/netfilter/ipv4/nf_nat_masquerade.h
+++ b/include/net/netfilter/ipv4/nf_nat_masquerade.h
@@ -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);
diff --git a/include/net/netfilter/ipv6/nf_nat_masquerade.h b/include/net/netfilter/ipv6/nf_nat_masquerade.h
index 1ed4f26..0c3b5eb 100644
--- a/include/net/netfilter/ipv6/nf_nat_masquerade.h
+++ b/include/net/netfilter/ipv6/nf_nat_masquerade.h
@@ -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);
diff --git a/include/net/netfilter/nf_nat.h b/include/net/netfilter/nf_nat.h
index 207a467..da3d601 100644
--- a/include/net/netfilter/nf_nat.h
+++ b/include/net/netfilter/nf_nat.h
@@ -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,
diff --git a/include/net/netfilter/nf_nat_l3proto.h b/include/net/netfilter/nf_nat_l3proto.h
index ce7c2b4..ac47098 100644
--- a/include/net/netfilter/nf_nat_l3proto.h
+++ b/include/net/netfilter/nf_nat_l3proto.h
@@ -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 *);
diff --git a/include/net/netfilter/nf_nat_l4proto.h b/include/net/netfilter/nf_nat_l4proto.h
index 67835ff..b4d6b29 100644
--- a/include/net/netfilter/nf_nat_l4proto.h
+++ b/include/net/netfilter/nf_nat_l4proto.h
@@ -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*/
diff --git a/include/net/netfilter/nf_nat_redirect.h b/include/net/netfilter/nf_nat_redirect.h
index 5ddabb0..c129aac 100644
--- a/include/net/netfilter/nf_nat_redirect.h
+++ b/include/net/netfilter/nf_nat_redirect.h
@@ -7,7 +7,7 @@  nf_nat_redirect_ipv4(struct sk_buff *skb,
  		     const struct nf_nat_ipv4_multi_range_compat *mr,
  		     unsigned int hooknum);
  unsigned int
-nf_nat_redirect_ipv6(struct sk_buff *skb, const struct nf_nat_range *range,
+nf_nat_redirect_ipv6(struct sk_buff *skb, const struct nf_nat_range2 *range,
  		     unsigned int hooknum);
  
  #endif /* _NF_NAT_REDIRECT_H_ */
diff --git a/include/uapi/linux/netfilter/nf_nat.h b/include/uapi/linux/netfilter/nf_nat.h
index a33000d..4a95c0d 100644
--- a/include/uapi/linux/netfilter/nf_nat.h
+++ b/include/uapi/linux/netfilter/nf_nat.h
@@ -10,6 +10,7 @@ 
  #define NF_NAT_RANGE_PROTO_RANDOM		(1 << 2)
  #define NF_NAT_RANGE_PERSISTENT			(1 << 3)
  #define NF_NAT_RANGE_PROTO_RANDOM_FULLY		(1 << 4)
+#define NF_NAT_RANGE_PROTO_OFFSET		(1 << 5)
  
  #define NF_NAT_RANGE_PROTO_RANDOM_ALL		\
  	(NF_NAT_RANGE_PROTO_RANDOM | NF_NAT_RANGE_PROTO_RANDOM_FULLY)
@@ -17,7 +18,7 @@ 
  #define NF_NAT_RANGE_MASK					\
  	(NF_NAT_RANGE_MAP_IPS | NF_NAT_RANGE_PROTO_SPECIFIED |	\
  	 NF_NAT_RANGE_PROTO_RANDOM | NF_NAT_RANGE_PERSISTENT |	\
-	 NF_NAT_RANGE_PROTO_RANDOM_FULLY)
+	 NF_NAT_RANGE_PROTO_RANDOM_FULLY | NF_NAT_RANGE_PROTO_OFFSET)
  
  struct nf_nat_ipv4_range {
  	unsigned int			flags;
@@ -40,4 +41,13 @@  struct nf_nat_range {
  	union nf_conntrack_man_proto	max_proto;
  };
  
+struct nf_nat_range2 {
+	unsigned int			flags;
+	union nf_inet_addr		min_addr;
+	union nf_inet_addr		max_addr;
+	union nf_conntrack_man_proto	min_proto;
+	union nf_conntrack_man_proto	max_proto;
+	union nf_conntrack_man_proto	base_proto;
+};
+
  #endif /* _NETFILTER_NF_NAT_H */
diff --git a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/ipt_MASQUERADE.c
index a03e4e7..ce1512b 100644
--- a/net/ipv4/netfilter/ipt_MASQUERADE.c
+++ b/net/ipv4/netfilter/ipt_MASQUERADE.c
@@ -47,7 +47,7 @@  static int masquerade_tg_check(const struct xt_tgchk_param *par)
  static unsigned int
  masquerade_tg(struct sk_buff *skb, const struct xt_action_param *par)
  {
-	struct nf_nat_range range;
+	struct nf_nat_range2 range;
  	const struct nf_nat_ipv4_multi_range_compat *mr;
  
  	mr = par->targinfo;
diff --git a/net/ipv4/netfilter/nf_nat_h323.c b/net/ipv4/netfilter/nf_nat_h323.c
index ac8342d..4e6b53a 100644
--- a/net/ipv4/netfilter/nf_nat_h323.c
+++ b/net/ipv4/netfilter/nf_nat_h323.c
@@ -395,7 +395,7 @@  static int nat_h245(struct sk_buff *skb, struct nf_conn *ct,
  static void ip_nat_q931_expect(struct nf_conn *new,
  			       struct nf_conntrack_expect *this)
  {
-	struct nf_nat_range range;
+	struct nf_nat_range2 range;
  
  	if (this->tuple.src.u3.ip != 0) {	/* Only accept calls from GK */
  		nf_nat_follow_master(new, this);
@@ -497,7 +497,7 @@  static int nat_q931(struct sk_buff *skb, struct nf_conn *ct,
  static void ip_nat_callforwarding_expect(struct nf_conn *new,
  					 struct nf_conntrack_expect *this)
  {
-	struct nf_nat_range range;
+	struct nf_nat_range2 range;
  
  	/* This must be a fresh one. */
  	BUG_ON(new->status & IPS_NAT_DONE_MASK);
diff --git a/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c b/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c
index a0f37b2..724324e 100644
--- a/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c
@@ -63,7 +63,7 @@  static void nf_nat_ipv4_decode_session(struct sk_buff *skb,
  #endif /* CONFIG_XFRM */
  
  static bool nf_nat_ipv4_in_range(const struct nf_conntrack_tuple *t,
-				 const struct nf_nat_range *range)
+				 const struct nf_nat_range2 *range)
  {
  	return ntohl(t->src.u3.ip) >= ntohl(range->min_addr.ip) &&
  	       ntohl(t->src.u3.ip) <= ntohl(range->max_addr.ip);
@@ -143,7 +143,7 @@  static void nf_nat_ipv4_csum_recalc(struct sk_buff *skb,
  
  #if IS_ENABLED(CONFIG_NF_CT_NETLINK)
  static int nf_nat_ipv4_nlattr_to_range(struct nlattr *tb[],
-				       struct nf_nat_range *range)
+				       struct nf_nat_range2 *range)
  {
  	if (tb[CTA_NAT_V4_MINIP]) {
  		range->min_addr.ip = nla_get_be32(tb[CTA_NAT_V4_MINIP]);
diff --git a/net/ipv4/netfilter/nf_nat_masquerade_ipv4.c b/net/ipv4/netfilter/nf_nat_masquerade_ipv4.c
index 0c366aa..f538c500 100644
--- a/net/ipv4/netfilter/nf_nat_masquerade_ipv4.c
+++ b/net/ipv4/netfilter/nf_nat_masquerade_ipv4.c
@@ -24,13 +24,13 @@ 
  
  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)
  {
  	struct nf_conn *ct;
  	struct nf_conn_nat *nat;
  	enum ip_conntrack_info ctinfo;
-	struct nf_nat_range newrange;
+	struct nf_nat_range2 newrange;
  	const struct rtable *rt;
  	__be32 newsrc, nh;
  
diff --git a/net/ipv4/netfilter/nf_nat_pptp.c b/net/ipv4/netfilter/nf_nat_pptp.c
index 8a69363..5d259a1 100644
--- a/net/ipv4/netfilter/nf_nat_pptp.c
+++ b/net/ipv4/netfilter/nf_nat_pptp.c
@@ -48,7 +48,7 @@  static void pptp_nat_expected(struct nf_conn *ct,
  	struct nf_conntrack_tuple t = {};
  	const struct nf_ct_pptp_master *ct_pptp_info;
  	const struct nf_nat_pptp *nat_pptp_info;
-	struct nf_nat_range range;
+	struct nf_nat_range2 range;
  	struct nf_conn_nat *nat;
  
  	nat = nf_ct_nat_ext_add(ct);
diff --git a/net/ipv4/netfilter/nf_nat_proto_gre.c b/net/ipv4/netfilter/nf_nat_proto_gre.c
index edf0500..00fda63 100644
--- a/net/ipv4/netfilter/nf_nat_proto_gre.c
+++ b/net/ipv4/netfilter/nf_nat_proto_gre.c
@@ -41,7 +41,7 @@  MODULE_DESCRIPTION("Netfilter NAT protocol helper module for GRE");
  static void
  gre_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)
  {
diff --git a/net/ipv4/netfilter/nf_nat_proto_icmp.c b/net/ipv4/netfilter/nf_nat_proto_icmp.c
index 7b98baa..6d7cf1d 100644
--- a/net/ipv4/netfilter/nf_nat_proto_icmp.c
+++ b/net/ipv4/netfilter/nf_nat_proto_icmp.c
@@ -30,7 +30,7 @@  icmp_in_range(const struct nf_conntrack_tuple *tuple,
  static void
  icmp_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)
  {
diff --git a/net/ipv4/netfilter/nft_masq_ipv4.c b/net/ipv4/netfilter/nft_masq_ipv4.c
index f186772..f1193e1 100644
--- a/net/ipv4/netfilter/nft_masq_ipv4.c
+++ b/net/ipv4/netfilter/nft_masq_ipv4.c
@@ -21,7 +21,7 @@  static void nft_masq_ipv4_eval(const struct nft_expr *expr,
  			       const struct nft_pktinfo *pkt)
  {
  	struct nft_masq *priv = nft_expr_priv(expr);
-	struct nf_nat_range range;
+	struct nf_nat_range2 range;
  
  	memset(&range, 0, sizeof(range));
  	range.flags = priv->flags;
diff --git a/net/ipv6/netfilter/ip6t_MASQUERADE.c b/net/ipv6/netfilter/ip6t_MASQUERADE.c
index 2b1a158..2916df3 100644
--- a/net/ipv6/netfilter/ip6t_MASQUERADE.c
+++ b/net/ipv6/netfilter/ip6t_MASQUERADE.c
@@ -29,7 +29,7 @@  masquerade_tg6(struct sk_buff *skb, const struct xt_action_param *par)
  
  static int masquerade_tg6_checkentry(const struct xt_tgchk_param *par)
  {
-	const struct nf_nat_range *range = par->targinfo;
+	const struct nf_nat_range2 *range = par->targinfo;
  
  	if (range->flags & NF_NAT_RANGE_MAP_IPS)
  		return -EINVAL;
diff --git a/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c b/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c
index 46d6dba..ece8043 100644
--- a/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c
@@ -62,7 +62,7 @@  static void nf_nat_ipv6_decode_session(struct sk_buff *skb,
  #endif
  
  static bool nf_nat_ipv6_in_range(const struct nf_conntrack_tuple *t,
-				 const struct nf_nat_range *range)
+				 const struct nf_nat_range2 *range)
  {
  	return ipv6_addr_cmp(&t->src.u3.in6, &range->min_addr.in6) >= 0 &&
  	       ipv6_addr_cmp(&t->src.u3.in6, &range->max_addr.in6) <= 0;
@@ -147,7 +147,7 @@  static void nf_nat_ipv6_csum_recalc(struct sk_buff *skb,
  
  #if IS_ENABLED(CONFIG_NF_CT_NETLINK)
  static int nf_nat_ipv6_nlattr_to_range(struct nlattr *tb[],
-				       struct nf_nat_range *range)
+				       struct nf_nat_range2 *range)
  {
  	if (tb[CTA_NAT_V6_MINIP]) {
  		nla_memcpy(&range->min_addr.ip6, tb[CTA_NAT_V6_MINIP],
diff --git a/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c b/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c
index 98f61fc..9dfc2b9 100644
--- a/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c
+++ b/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c
@@ -26,14 +26,14 @@ 
  static atomic_t v6_worker_count;
  
  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)
  {
  	enum ip_conntrack_info ctinfo;
  	struct nf_conn_nat *nat;
  	struct in6_addr src;
  	struct nf_conn *ct;
-	struct nf_nat_range newrange;
+	struct nf_nat_range2 newrange;
  
  	ct = nf_ct_get(skb, &ctinfo);
  	WARN_ON(!(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED ||
diff --git a/net/ipv6/netfilter/nf_nat_proto_icmpv6.c b/net/ipv6/netfilter/nf_nat_proto_icmpv6.c
index 57593b00..d9bf42b 100644
--- a/net/ipv6/netfilter/nf_nat_proto_icmpv6.c
+++ b/net/ipv6/netfilter/nf_nat_proto_icmpv6.c
@@ -32,7 +32,7 @@  icmpv6_in_range(const struct nf_conntrack_tuple *tuple,
  static void
  icmpv6_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)
  {
diff --git a/net/ipv6/netfilter/nft_masq_ipv6.c b/net/ipv6/netfilter/nft_masq_ipv6.c
index 4146536..dd0122f 100644
--- a/net/ipv6/netfilter/nft_masq_ipv6.c
+++ b/net/ipv6/netfilter/nft_masq_ipv6.c
@@ -22,7 +22,7 @@  static void nft_masq_ipv6_eval(const struct nft_expr *expr,
  			       const struct nft_pktinfo *pkt)
  {
  	struct nft_masq *priv = nft_expr_priv(expr);
-	struct nf_nat_range range;
+	struct nf_nat_range2 range;
  
  	memset(&range, 0, sizeof(range));
  	range.flags = priv->flags;
diff --git a/net/ipv6/netfilter/nft_redir_ipv6.c b/net/ipv6/netfilter/nft_redir_ipv6.c
index a27e424..7426986 100644
--- a/net/ipv6/netfilter/nft_redir_ipv6.c
+++ b/net/ipv6/netfilter/nft_redir_ipv6.c
@@ -22,7 +22,7 @@  static void nft_redir_ipv6_eval(const struct nft_expr *expr,
  				const struct nft_pktinfo *pkt)
  {
  	struct nft_redir *priv = nft_expr_priv(expr);
-	struct nf_nat_range range;
+	struct nf_nat_range2 range;
  
  	memset(&range, 0, sizeof(range));
  	if (priv->sreg_proto_min) {
diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
index af8345f..b49a88f 100644
--- a/net/netfilter/nf_nat_core.c
+++ b/net/netfilter/nf_nat_core.c
@@ -155,7 +155,7 @@  EXPORT_SYMBOL(nf_nat_used_tuple);
  static int in_range(const struct nf_nat_l3proto *l3proto,
  		    const struct nf_nat_l4proto *l4proto,
  		    const struct nf_conntrack_tuple *tuple,
-		    const struct nf_nat_range *range)
+		    const struct nf_nat_range2 *range)
  {
  	/* If we are supposed to map IPs, then we must be in the
  	 * range specified, otherwise let this drag us onto a new src IP.
@@ -192,7 +192,7 @@  find_appropriate_src(struct net *net,
  		     const struct nf_nat_l4proto *l4proto,
  		     const struct nf_conntrack_tuple *tuple,
  		     struct nf_conntrack_tuple *result,
-		     const struct nf_nat_range *range)
+		     const struct nf_nat_range2 *range)
  {
  	unsigned int h = hash_by_src(net, tuple);
  	const struct nf_conn *ct;
@@ -222,7 +222,7 @@  find_appropriate_src(struct net *net,
  static void
  find_best_ips_proto(const struct nf_conntrack_zone *zone,
  		    struct nf_conntrack_tuple *tuple,
-		    const struct nf_nat_range *range,
+		    const struct nf_nat_range2 *range,
  		    const struct nf_conn *ct,
  		    enum nf_nat_manip_type maniptype)
  {
@@ -296,7 +296,7 @@  find_best_ips_proto(const struct nf_conntrack_zone *zone,
  static void
  get_unique_tuple(struct nf_conntrack_tuple *tuple,
  		 const struct nf_conntrack_tuple *orig_tuple,
-		 const struct nf_nat_range *range,
+		 const struct nf_nat_range2 *range,
  		 struct nf_conn *ct,
  		 enum nf_nat_manip_type maniptype)
  {
@@ -347,9 +347,10 @@  get_unique_tuple(struct nf_conntrack_tuple *tuple,
  	/* Only bother mapping if it's not already in range and unique */
  	if (!(range->flags & NF_NAT_RANGE_PROTO_RANDOM_ALL)) {
  		if (range->flags & NF_NAT_RANGE_PROTO_SPECIFIED) {
-			if (l4proto->in_range(tuple, maniptype,
-					      &range->min_proto,
-					      &range->max_proto) &&
+			if (!(range->flags & NF_NAT_RANGE_PROTO_OFFSET) &&
+			    l4proto->in_range(tuple, maniptype,
+			          &range->min_proto,
+			          &range->max_proto) &&
  			    (range->min_proto.all == range->max_proto.all ||
  			     !nf_nat_used_tuple(tuple, ct)))
  				goto out;
@@ -358,7 +359,7 @@  get_unique_tuple(struct nf_conntrack_tuple *tuple,
  		}
  	}
  
-	/* Last change: get protocol to try to obtain unique tuple. */
+	/* Last chance: get protocol to try to obtain unique tuple. */
  	l4proto->unique_tuple(l3proto, tuple, range, maniptype, ct);
  out:
  	rcu_read_unlock();
@@ -379,7 +380,7 @@  EXPORT_SYMBOL_GPL(nf_ct_nat_ext_add);
  
  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)
  {
  	struct net *net = nf_ct_net(ct);
@@ -457,7 +458,7 @@  __nf_nat_alloc_null_binding(struct nf_conn *ct, enum nf_nat_manip_type manip)
  		(manip == NF_NAT_MANIP_SRC ?
  		ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3 :
  		ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3);
-	struct nf_nat_range range = {
+	struct nf_nat_range2 range = {
  		.flags		= NF_NAT_RANGE_MAP_IPS,
  		.min_addr	= ip,
  		.max_addr	= ip,
@@ -703,7 +704,7 @@  static const struct nla_policy protonat_nla_policy[CTA_PROTONAT_MAX+1] = {
  
  static int nfnetlink_parse_nat_proto(struct nlattr *attr,
  				     const struct nf_conn *ct,
-				     struct nf_nat_range *range)
+				     struct nf_nat_range2 *range)
  {
  	struct nlattr *tb[CTA_PROTONAT_MAX+1];
  	const struct nf_nat_l4proto *l4proto;
@@ -731,7 +732,7 @@  static const struct nla_policy nat_nla_policy[CTA_NAT_MAX+1] = {
  
  static int
  nfnetlink_parse_nat(const struct nlattr *nat,
-		    const struct nf_conn *ct, struct nf_nat_range *range,
+		    const struct nf_conn *ct, struct nf_nat_range2 *range,
  		    const struct nf_nat_l3proto *l3proto)
  {
  	struct nlattr *tb[CTA_NAT_MAX+1];
@@ -759,7 +760,7 @@  nfnetlink_parse_nat_setup(struct nf_conn *ct,
  			  enum nf_nat_manip_type manip,
  			  const struct nlattr *attr)
  {
-	struct nf_nat_range range;
+	struct nf_nat_range2 range;
  	const struct nf_nat_l3proto *l3proto;
  	int err;
  
diff --git a/net/netfilter/nf_nat_helper.c b/net/netfilter/nf_nat_helper.c
index 607a373..99606ba 100644
--- a/net/netfilter/nf_nat_helper.c
+++ b/net/netfilter/nf_nat_helper.c
@@ -191,7 +191,7 @@  EXPORT_SYMBOL(nf_nat_mangle_udp_packet);
  void nf_nat_follow_master(struct nf_conn *ct,
  			  struct nf_conntrack_expect *exp)
  {
-	struct nf_nat_range range;
+	struct nf_nat_range2 range;
  
  	/* This must be a fresh one. */
  	BUG_ON(ct->status & IPS_NAT_DONE_MASK);
diff --git a/net/netfilter/nf_nat_proto_common.c b/net/netfilter/nf_nat_proto_common.c
index fbce552..432d3d4 100644
--- a/net/netfilter/nf_nat_proto_common.c
+++ b/net/netfilter/nf_nat_proto_common.c
@@ -36,7 +36,7 @@  EXPORT_SYMBOL_GPL(nf_nat_l4proto_in_range);
  
  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)
@@ -80,6 +80,8 @@  void nf_nat_l4proto_unique_tuple(const struct nf_nat_l3proto *l3proto,
  						  : tuple->src.u.all);
  	} else if (range->flags & NF_NAT_RANGE_PROTO_RANDOM_FULLY) {
  		off = prandom_u32();
+	} else if (range->flags & NF_NAT_RANGE_PROTO_OFFSET) {
+		off = (ntohs(*portptr) - ntohs(range->base_proto.all));
  	} else {
  		off = *rover;
  	}
@@ -88,7 +90,8 @@  void nf_nat_l4proto_unique_tuple(const struct nf_nat_l3proto *l3proto,
  		*portptr = htons(min + off % range_size);
  		if (++i != range_size && nf_nat_used_tuple(tuple, ct))
  			continue;
-		if (!(range->flags & NF_NAT_RANGE_PROTO_RANDOM_ALL))
+		if (!(range->flags & (NF_NAT_RANGE_PROTO_RANDOM_ALL|
+					NF_NAT_RANGE_PROTO_OFFSET)))
  			*rover = off;
  		return;
  	}
@@ -97,7 +100,7 @@  EXPORT_SYMBOL_GPL(nf_nat_l4proto_unique_tuple);
  
  #if IS_ENABLED(CONFIG_NF_CT_NETLINK)
  int nf_nat_l4proto_nlattr_to_range(struct nlattr *tb[],
-				   struct nf_nat_range *range)
+				   struct nf_nat_range2 *range)
  {
  	if (tb[CTA_PROTONAT_PORT_MIN]) {
  		range->min_proto.all = nla_get_be16(tb[CTA_PROTONAT_PORT_MIN]);
diff --git a/net/netfilter/nf_nat_proto_dccp.c b/net/netfilter/nf_nat_proto_dccp.c
index 269fcd5..67ea0d8 100644
--- a/net/netfilter/nf_nat_proto_dccp.c
+++ b/net/netfilter/nf_nat_proto_dccp.c
@@ -23,7 +23,7 @@  static u_int16_t dccp_port_rover;
  static void
  dccp_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)
  {
diff --git a/net/netfilter/nf_nat_proto_sctp.c b/net/netfilter/nf_nat_proto_sctp.c
index c57ee32..1c5d9b6 100644
--- a/net/netfilter/nf_nat_proto_sctp.c
+++ b/net/netfilter/nf_nat_proto_sctp.c
@@ -17,7 +17,7 @@  static u_int16_t nf_sctp_port_rover;
  static void
  sctp_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)
  {
diff --git a/net/netfilter/nf_nat_proto_tcp.c b/net/netfilter/nf_nat_proto_tcp.c
index 4f8820f..f15fcd4 100644
--- a/net/netfilter/nf_nat_proto_tcp.c
+++ b/net/netfilter/nf_nat_proto_tcp.c
@@ -23,7 +23,7 @@  static u16 tcp_port_rover;
  static void
  tcp_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)
  {
diff --git a/net/netfilter/nf_nat_proto_udp.c b/net/netfilter/nf_nat_proto_udp.c
index edd4a77..5790f70 100644
--- a/net/netfilter/nf_nat_proto_udp.c
+++ b/net/netfilter/nf_nat_proto_udp.c
@@ -22,7 +22,7 @@  static u16 udp_port_rover;
  static void
  udp_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)
  {
@@ -100,7 +100,7 @@  static bool udplite_manip_pkt(struct sk_buff *skb,
  static void
  udplite_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)
  {
diff --git a/net/netfilter/nf_nat_proto_unknown.c b/net/netfilter/nf_nat_proto_unknown.c
index 6e494d5..c5db3e2 100644
--- a/net/netfilter/nf_nat_proto_unknown.c
+++ b/net/netfilter/nf_nat_proto_unknown.c
@@ -27,7 +27,7 @@  static bool unknown_in_range(const struct nf_conntrack_tuple *tuple,
  
  static void unknown_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)
  {
diff --git a/net/netfilter/nf_nat_redirect.c b/net/netfilter/nf_nat_redirect.c
index 25b06b9..7c4bb0a 100644
--- a/net/netfilter/nf_nat_redirect.c
+++ b/net/netfilter/nf_nat_redirect.c
@@ -36,7 +36,7 @@  nf_nat_redirect_ipv4(struct sk_buff *skb,
  	struct nf_conn *ct;
  	enum ip_conntrack_info ctinfo;
  	__be32 newdst;
-	struct nf_nat_range newrange;
+	struct nf_nat_range2 newrange;
  
  	WARN_ON(hooknum != NF_INET_PRE_ROUTING &&
  		hooknum != NF_INET_LOCAL_OUT);
@@ -82,10 +82,10 @@  EXPORT_SYMBOL_GPL(nf_nat_redirect_ipv4);
  static const struct in6_addr loopback_addr = IN6ADDR_LOOPBACK_INIT;
  
  unsigned int
-nf_nat_redirect_ipv6(struct sk_buff *skb, const struct nf_nat_range *range,
+nf_nat_redirect_ipv6(struct sk_buff *skb, const struct nf_nat_range2 *range,
  		     unsigned int hooknum)
  {
-	struct nf_nat_range newrange;
+	struct nf_nat_range2 newrange;
  	struct in6_addr newdst;
  	enum ip_conntrack_info ctinfo;
  	struct nf_conn *ct;
diff --git a/net/netfilter/nf_nat_sip.c b/net/netfilter/nf_nat_sip.c
index 791fac4..1f30860 100644
--- a/net/netfilter/nf_nat_sip.c
+++ b/net/netfilter/nf_nat_sip.c
@@ -316,7 +316,7 @@  static void nf_nat_sip_seq_adjust(struct sk_buff *skb, unsigned int protoff,
  static void nf_nat_sip_expected(struct nf_conn *ct,
  				struct nf_conntrack_expect *exp)
  {
-	struct nf_nat_range range;
+	struct nf_nat_range2 range;
  
  	/* This must be a fresh one. */
  	BUG_ON(ct->status & IPS_NAT_DONE_MASK);
diff --git a/net/netfilter/nft_nat.c b/net/netfilter/nft_nat.c
index ed548d0..9d9aee6 100644
--- a/net/netfilter/nft_nat.c
+++ b/net/netfilter/nft_nat.c
@@ -43,7 +43,7 @@  static void nft_nat_eval(const struct nft_expr *expr,
  	const struct nft_nat *priv = nft_expr_priv(expr);
  	enum ip_conntrack_info ctinfo;
  	struct nf_conn *ct = nf_ct_get(pkt->skb, &ctinfo);
-	struct nf_nat_range range;
+	struct nf_nat_range2 range;
  
  	memset(&range, 0, sizeof(range));
  	if (priv->sreg_addr_min) {
diff --git a/net/netfilter/xt_NETMAP.c b/net/netfilter/xt_NETMAP.c
index 58aa9dd..1d43787 100644
--- a/net/netfilter/xt_NETMAP.c
+++ b/net/netfilter/xt_NETMAP.c
@@ -21,8 +21,8 @@ 
  static unsigned int
  netmap_tg6(struct sk_buff *skb, const struct xt_action_param *par)
  {
-	const struct nf_nat_range *range = par->targinfo;
-	struct nf_nat_range newrange;
+	const struct nf_nat_range2 *range = par->targinfo;
+	struct nf_nat_range2 newrange;
  	struct nf_conn *ct;
  	enum ip_conntrack_info ctinfo;
  	union nf_inet_addr new_addr, netmask;
@@ -56,7 +56,7 @@  netmap_tg6(struct sk_buff *skb, const struct xt_action_param *par)
  
  static int netmap_tg6_checkentry(const struct xt_tgchk_param *par)
  {
-	const struct nf_nat_range *range = par->targinfo;
+	const struct nf_nat_range2 *range = par->targinfo;
  
  	if (!(range->flags & NF_NAT_RANGE_MAP_IPS))
  		return -EINVAL;
@@ -75,7 +75,7 @@  netmap_tg4(struct sk_buff *skb, const struct xt_action_param *par)
  	enum ip_conntrack_info ctinfo;
  	__be32 new_ip, netmask;
  	const struct nf_nat_ipv4_multi_range_compat *mr = par->targinfo;
-	struct nf_nat_range newrange;
+	struct nf_nat_range2 newrange;
  
  	WARN_ON(xt_hooknum(par) != NF_INET_PRE_ROUTING &&
  		xt_hooknum(par) != NF_INET_POST_ROUTING &&
diff --git a/net/netfilter/xt_REDIRECT.c b/net/netfilter/xt_REDIRECT.c
index 98a4c6d..5ce9461 100644
--- a/net/netfilter/xt_REDIRECT.c
+++ b/net/netfilter/xt_REDIRECT.c
@@ -36,7 +36,7 @@  redirect_tg6(struct sk_buff *skb, const struct xt_action_param *par)
  
  static int redirect_tg6_checkentry(const struct xt_tgchk_param *par)
  {
-	const struct nf_nat_range *range = par->targinfo;
+	const struct nf_nat_range2 *range = par->targinfo;
  
  	if (range->flags & NF_NAT_RANGE_MAP_IPS)
  		return -EINVAL;
diff --git a/net/netfilter/xt_nat.c b/net/netfilter/xt_nat.c
index 0fd14d1..d3002b2 100644
--- a/net/netfilter/xt_nat.c
+++ b/net/netfilter/xt_nat.c
@@ -36,11 +36,12 @@  static void xt_nat_destroy(const struct xt_tgdtor_param *par)
  	nf_ct_netns_put(par->net, par->family);
  }
  
-static void xt_nat_convert_range(struct nf_nat_range *dst,
+static void xt_nat_convert_range(struct nf_nat_range2 *dst,
  				 const struct nf_nat_ipv4_range *src)
  {
  	memset(&dst->min_addr, 0, sizeof(dst->min_addr));
  	memset(&dst->max_addr, 0, sizeof(dst->max_addr));
+	memset(&dst->base_proto, 0, sizeof(dst->base_proto));
  
  	dst->flags	 = src->flags;
  	dst->min_addr.ip = src->min_ip;
@@ -53,7 +54,7 @@  static unsigned int
  xt_snat_target_v0(struct sk_buff *skb, const struct xt_action_param *par)
  {
  	const struct nf_nat_ipv4_multi_range_compat *mr = par->targinfo;
-	struct nf_nat_range range;
+	struct nf_nat_range2 range;
  	enum ip_conntrack_info ctinfo;
  	struct nf_conn *ct;
  
@@ -70,7 +71,7 @@  static unsigned int
  xt_dnat_target_v0(struct sk_buff *skb, const struct xt_action_param *par)
  {
  	const struct nf_nat_ipv4_multi_range_compat *mr = par->targinfo;
-	struct nf_nat_range range;
+	struct nf_nat_range2 range;
  	enum ip_conntrack_info ctinfo;
  	struct nf_conn *ct;
  
@@ -85,7 +86,8 @@  xt_dnat_target_v0(struct sk_buff *skb, const struct xt_action_param *par)
  static unsigned int
  xt_snat_target_v1(struct sk_buff *skb, const struct xt_action_param *par)
  {
-	const struct nf_nat_range *range = par->targinfo;
+	const struct nf_nat_range *range_v1 = par->targinfo;
+	struct nf_nat_range2 range;
  	enum ip_conntrack_info ctinfo;
  	struct nf_conn *ct;
  
@@ -94,13 +96,49 @@  xt_snat_target_v1(struct sk_buff *skb, const struct xt_action_param *par)
  		 (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED ||
  		  ctinfo == IP_CT_RELATED_REPLY)));
  
-	return nf_nat_setup_info(ct, range, NF_NAT_MANIP_SRC);
+	memcpy(&range, range_v1, sizeof(*range_v1));
+	memset(&range.base_proto, 0, sizeof(range.base_proto));
+
+	return nf_nat_setup_info(ct, &range, NF_NAT_MANIP_SRC);
  }
  
  static unsigned int
  xt_dnat_target_v1(struct sk_buff *skb, const struct xt_action_param *par)
  {
-	const struct nf_nat_range *range = par->targinfo;
+	const struct nf_nat_range *range_v1 = par->targinfo;
+	struct nf_nat_range2 range;
+	enum ip_conntrack_info ctinfo;
+	struct nf_conn *ct;
+
+	ct = nf_ct_get(skb, &ctinfo);
+	WARN_ON(!(ct != NULL &&
+		 (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED)));
+
+	memcpy(&range, range_v1, sizeof(*range_v1));
+	memset(&range.base_proto, 0, sizeof(range.base_proto));
+
+	return nf_nat_setup_info(ct, &range, NF_NAT_MANIP_DST);
+}
+
+static unsigned int
+xt_snat_target_v2(struct sk_buff *skb, const struct xt_action_param *par)
+{
+	const struct nf_nat_range2 *range = par->targinfo;
+	enum ip_conntrack_info ctinfo;
+	struct nf_conn *ct;
+
+	ct = nf_ct_get(skb, &ctinfo);
+	WARN_ON(!(ct != NULL &&
+		 (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED ||
+		  ctinfo == IP_CT_RELATED_REPLY)));
+
+	return nf_nat_setup_info(ct, range, NF_NAT_MANIP_SRC);
+}
+
+static unsigned int
+xt_dnat_target_v2(struct sk_buff *skb, const struct xt_action_param *par)
+{
+	const struct nf_nat_range2 *range = par->targinfo;
  	enum ip_conntrack_info ctinfo;
  	struct nf_conn *ct;
  
@@ -162,6 +200,28 @@  static struct xt_target xt_nat_target_reg[] __read_mostly = {
  				  (1 << NF_INET_LOCAL_OUT),
  		.me		= THIS_MODULE,
  	},
+	{
+		.name		= "SNAT",
+		.revision	= 2,
+		.checkentry	= xt_nat_checkentry,
+		.destroy	= xt_nat_destroy,
+		.target		= xt_snat_target_v2,
+		.targetsize	= sizeof(struct nf_nat_range2),
+		.table		= "nat",
+		.hooks		= (1 << NF_INET_POST_ROUTING) |
+				  (1 << NF_INET_LOCAL_IN),
+		.me		= THIS_MODULE,
+	},
+	{
+		.name		= "DNAT",
+		.revision	= 2,
+		.target		= xt_dnat_target_v2,
+		.targetsize	= sizeof(struct nf_nat_range2),
+		.table		= "nat",
+		.hooks		= (1 << NF_INET_PRE_ROUTING) |
+				  (1 << NF_INET_LOCAL_OUT),
+		.me		= THIS_MODULE,
+	},
  };
  
  static int __init xt_nat_init(void)