[netfilter-cvslog] r4041 - trunk/patch-o-matic-ng/patchlets/quake3-conntrack-nat/linux-2.6.11/net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-06-27 16:00:11 +0200 (Mon, 27 Jun 2005)
New Revision: 4041

Modified:
   trunk/patch-o-matic-ng/patchlets/quake3-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_quake3.c
Log:
fix compiler warnings on 64bit systems


Modified: trunk/patch-o-matic-ng/patchlets/quake3-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_quake3.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/quake3-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_quake3.c	2005-06-27 13:50:44 UTC (rev 4040)
+++ trunk/patch-o-matic-ng/patchlets/quake3-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_quake3.c	2005-06-27 14:00:11 UTC (rev 4041)
@@ -60,7 +60,7 @@
 {
 	struct udphdr _udph, *uh;
 	struct ip_conntrack_expect *exp;
-	char *data, *qb_ptr;
+	void *data, *qb_ptr;
 	int dir = CTINFO2DIR(ctinfo);
 	int i, dataoff;
 	int ret = NF_ACCEPT;
@@ -102,11 +102,12 @@
 				1 byte "\" */
 		    i+6 < ntohs(uh->len);
 		    i+=7) {
+			u_int32_t *ip = data+i;
+			u_int16_t *port = data+i+4;
 #if 0
 			DEBUGP("ip_conntrack_quake3: adding server at offset "
 			       "%u/%u %u.%u.%u.%u:%u\n", i, ntohs(uh->len),
-			       NIPQUAD( (u_int32_t) *( (u_int32_t *)( (int)udph + i ) ) ), 
-			       ntohs((__u16) *( (__u16 *)( (int)udph + i + 4 ) ) ) );
+			       NIPQUAD(*ip), ntohs(*port));
 #endif
 
 			exp = ip_conntrack_expect_alloc();
@@ -118,10 +119,8 @@
 			memset(exp, 0, sizeof(*exp));
 
 			exp->tuple.src.ip = ct->tuplehash[!dir].tuple.src.ip;
-			exp->tuple.dst.ip = 
-				(u_int32_t) *((u_int32_t *)((int)data+i));
-			exp->tuple.dst.u.udp.port = 
-				(__u16) *((__u16 *)((int)data+i+4));
+			exp->tuple.dst.ip = *ip;
+			exp->tuple.dst.u.udp.port = *port;
 			exp->tuple.dst.protonum = IPPROTO_UDP;
 
 			exp->mask.src.ip = 0xffffffff;