Skip to contentSkip to conversation

: Use correct byteorder in ICMP NAT

PATCH Applied Patrick McHardy 2 participants 2 messages Jul 22, 2005

Subsystems (2)
Networking netfilter
lore
Share & tools
lore

Patrick McHardy

author
#0 lore raw

PATCH 4/5 : Use correct byteorder in ICMP NAT

[NETFILTER]: Use correct byteorder in ICMP NAT

Signed-off-by Patrick McHardy <[email protected]>

---
commit d778c0e9a5c2aa805b7c297b5712efb9c1ada2c6
tree 852cbf03161a4a0d4453cc820a630a8dcf5c0181
parent dd51c6e4ab8df9819d686b0a88a6d7ec8b3d2b28
author Patrick McHardy <[email protected]> Fri, 22 Jul 2005 09:24:04 +0200 committer Patrick McHardy <[email protected]> Fri, 22 Jul 2005 09:24:04 +0200

 net/ipv4/netfilter/ip_nat_proto_icmp.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
net/ipv4/netfilter/ip_nat_proto_icmp.c +4 -3
@@ -35,16 +35,17 @@ icmp_unique_tuple(struct ip_conntrack_tu
 		  const struct ip_conntrack *conntrack)
 {
 	static u_int16_t id;
-	unsigned int range_size
-		= (unsigned int)range->max.icmp.id - range->min.icmp.id + 1;
+	unsigned int range_size;
 	unsigned int i;
 
+	range_size = ntohs(range->max.icmp.id) - ntohs(range->min.icmp.id) + 1;
 	/* If no range specified... */
 	if (!(range->flags & IP_NAT_RANGE_PROTO_SPECIFIED))
 		range_size = 0xFFFF;
 
 	for (i = 0; i < range_size; i++, id++) {
-		tuple->src.u.icmp.id = range->min.icmp.id + (id % range_size);
+		tuple->src.u.icmp.id = htons(ntohs(range->min.icmp.id) +
+		                             (id % range_size));
 		if (!ip_nat_used_tuple(tuple, conntrack))
 			return 1;
 	}