[netfilter-cvslog] r3830 - trunk/patch-o-matic-ng/h323-conntrack-nat/linux-2.6/net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-04-09 12:10:46 +0200 (Sat, 09 Apr 2005)
New Revision: 3830

Modified:
   trunk/patch-o-matic-ng/h323-conntrack-nat/linux-2.6/net/ipv4/netfilter/ip_nat_h323.c
Log:
2.6.x < 2.6.11 still has 'ip_nat_multi_range' instead of ip_nat_range


Modified: trunk/patch-o-matic-ng/h323-conntrack-nat/linux-2.6/net/ipv4/netfilter/ip_nat_h323.c
===================================================================
--- trunk/patch-o-matic-ng/h323-conntrack-nat/linux-2.6/net/ipv4/netfilter/ip_nat_h323.c	2005-04-09 10:09:16 UTC (rev 3829)
+++ trunk/patch-o-matic-ng/h323-conntrack-nat/linux-2.6/net/ipv4/netfilter/ip_nat_h323.c	2005-04-09 10:10:46 UTC (rev 3830)
@@ -71,7 +71,7 @@
 		  struct ip_conntrack *ct,
 		  struct ip_nat_info *info)
 {
-	struct ip_nat_range range;
+	struct ip_nat_multi_range mr;
 	u_int32_t newdstip, newsrcip, newip;
 	u_int16_t port;
 	struct ip_ct_h225_expect *exp_info;
@@ -120,19 +120,20 @@
 	DEBUGP("h225_nat_expected: IP to %u.%u.%u.%u\n", NIPQUAD(newip));
 
 	/* We don't want to manip the per-protocol, just the IPs... */
-	range.flags = IP_NAT_RANGE_MAP_IPS;
-	range.min_ip = range.max_ip = newip;
+	mr.rangesize = 1;
+	mr.range[0].flags = IP_NAT_RANGE_MAP_IPS;
+	mr.range[0].min_ip = mr.range[0].max_ip = newip;
 
 	/* ... unless we're doing a MANIP_DST, in which case, make
 	   sure we map to the correct port */
 	if (HOOK2MANIP(hooknum) == IP_NAT_MANIP_DST) {
-		range.flags |= IP_NAT_RANGE_PROTO_SPECIFIED;
-		range.min = range.max
+		mr.range[0].flags |= IP_NAT_RANGE_PROTO_SPECIFIED;
+		mr.range[0].min = mr.range[0].max
 			= ((union ip_conntrack_manip_proto)
 				{ .tcp = { port } });
 	}
 
-	ret = ip_nat_setup_info(ct, &range, hooknum);
+	ret = ip_nat_setup_info(ct, &mr, hooknum);
 
 	if (is_h225) {
 		DEBUGP("h225_nat_expected: H.225, setting NAT helper for %p\n", ct);