[netfilter-cvslog] r3580 - in trunk/nfsim: . core core/ipv4 kernelenv/include

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2005-01-07 04:04:15 +0100 (Fri, 07 Jan 2005)
New Revision: 3580

Modified:
   trunk/nfsim/Makefile.in
   trunk/nfsim/core/core.c
   trunk/nfsim/core/fakesockopt.c
   trunk/nfsim/core/ipv4/ipv4.c
   trunk/nfsim/core/message.c
   trunk/nfsim/core/nfsockopt.h
   trunk/nfsim/kernelenv/include/kernelenv.h
Log:
Patrick McHardy's nfsim 64-bit compat fixes.


Modified: trunk/nfsim/Makefile.in
===================================================================
--- trunk/nfsim/Makefile.in	2005-01-06 16:57:37 UTC (rev 3579)
+++ trunk/nfsim/Makefile.in	2005-01-07 03:04:15 UTC (rev 3580)
@@ -58,6 +58,12 @@
 		-o $@ $^
 	ln -sf core/fakesockopt.so.1.0 ./
 
+core/fakesockopt.o:
+	$(CC) $(CFLAGS) -c -fPIC core/fakesockopt.c -o core/fakesockopt.o
+
+core/utils.o:
+	$(CC) $(CFLAGS) -c -fPIC core/utils.c -o core/utils.o
+
 core/usage.o: core/usage.c
 core/usage.c: $(USAGE_SOURCES) doc/gen-usage
 	doc/gen-usage $(USAGE_SOURCES) >$@

Modified: trunk/nfsim/core/core.c
===================================================================
--- trunk/nfsim/core/core.c	2005-01-06 16:57:37 UTC (rev 3579)
+++ trunk/nfsim/core/core.c	2005-01-07 03:04:15 UTC (rev 3580)
@@ -431,7 +431,7 @@
 		oldpath = getenv("LD_LIBRARY_PATH");
 		path = talloc_asprintf(NULL, "%s%s%.*s",
 				       oldpath ?:"", oldpath ? ":" : "",
-				       p - argv[0], argv[0]);
+				       (int)(p - argv[0]), argv[0]);
 		setenv("LD_LIBRARY_PATH", path, 1);
 		talloc_free(path);
 	}

Modified: trunk/nfsim/core/fakesockopt.c
===================================================================
--- trunk/nfsim/core/fakesockopt.c	2005-01-06 16:57:37 UTC (rev 3579)
+++ trunk/nfsim/core/fakesockopt.c	2005-01-07 03:04:15 UTC (rev 3580)
@@ -234,8 +234,8 @@
 	msg.args[0] = PF_INET;
 	/*msg.args[1] = level;*/
 	msg.args[1] = optname;
-	msg.args[2] = (int)optval;
-	msg.args[3] = (int)*optlen;
+	msg.args[2] = (unsigned long)optval;
+	msg.args[3] = (unsigned long)*optlen;
 	ret = fake_syscall(&msg);
 	*optlen = msg.args[3];
 	return ret;
@@ -249,8 +249,8 @@
 	msg.args[0] = PF_INET;
 	/*msg.args[1] = level;*/
 	msg.args[1] = optname;
-	msg.args[2] = (int)optval;
-	msg.args[3] = (int)optlen;
+	msg.args[2] = (unsigned long)optval;
+	msg.args[3] = (unsigned long)optlen;
 	return fake_syscall(&msg);
 }
 

Modified: trunk/nfsim/core/ipv4/ipv4.c
===================================================================
--- trunk/nfsim/core/ipv4/ipv4.c	2005-01-06 16:57:37 UTC (rev 3579)
+++ trunk/nfsim/core/ipv4/ipv4.c	2005-01-07 03:04:15 UTC (rev 3580)
@@ -600,7 +600,7 @@
 		if (count) {
 		        unsigned long carry = 0;
 			do {
-				unsigned long w = *(unsigned long *) buff;
+				unsigned int w = *(unsigned int *) buff;
 				count--;
 				buff += 4;
 				result += carry;
@@ -819,7 +819,7 @@
 	switch (iph->protocol) {
 	case IPPROTO_ICMP:
 		icmph = (struct icmphdr *)(iph + 1);
-		ptr += sprintf(ptr, "%u %u ",
+		ptr += sprintf(ptr, "%Zu %u ",
 		       iplen - sizeof(struct icmphdr), iph->protocol);
 
 		if (len < sizeof(struct icmphdr)) {
@@ -855,7 +855,7 @@
 
 	case IPPROTO_UDP:
 		udph = (struct udphdr *)(iph + 1);
-		ptr += sprintf(ptr, "%u %u ",
+		ptr += sprintf(ptr, "%Zu %u ",
 		       iplen - sizeof(struct udphdr), iph->protocol);
 
 		if (len < sizeof(struct udphdr)) {
@@ -891,7 +891,7 @@
 		tcph = (struct tcphdr *)(iph + 1);
 		if (len < sizeof(struct tcphdr)) {
 			/* Assume no tcp options... */
-			ptr += sprintf(ptr, "%u %u ",
+			ptr += sprintf(ptr, "%Zu %u ",
 				       iplen - sizeof(*tcph), iph->protocol);
 
 			ptr += sprintf(ptr, "-TRUNCATED-");

Modified: trunk/nfsim/core/message.c
===================================================================
--- trunk/nfsim/core/message.c	2005-01-06 16:57:37 UTC (rev 3579)
+++ trunk/nfsim/core/message.c	2005-01-07 03:04:15 UTC (rev 3580)
@@ -282,7 +282,7 @@
 					  msg.args[3]);
 			msg.retval = nf_getsockopt(NULL, msg.args[0],
 					msg.args[1], (char *)msg.args[2],
-					&msg.args[3]);
+					(int *)&msg.args[3]);
 			if (strace)
 				nfsim_log(LOG_USERSPACE,
 					  "    getsockopt -> %s (len %i)",
@@ -358,9 +358,9 @@
 	msg->type = UM_KERNELOP;
 	msg->opcode = KOP_COPY_TO_USER;
 	msg->len = n;
-	msg->args[0] = (int)to;
-	msg->args[1] = (int)from;
-	msg->args[2] = (int)n;
+	msg->args[0] = (unsigned long)to;
+	msg->args[1] = (unsigned long)from;
+	msg->args[2] = (unsigned long)n;
 
 	/* Keep valgrind happy.*/
 	msg->args[3] = 0;
@@ -393,9 +393,9 @@
 	msg.type = UM_KERNELOP;
 	msg.opcode = KOP_COPY_FROM_USER;
 	msg.len = 0;
-	msg.args[0] = (int)to;
-	msg.args[1] = (int)from;
-	msg.args[2] = (int)n;
+	msg.args[0] = (unsigned long)to;
+	msg.args[1] = (unsigned long)from;
+	msg.args[2] = (unsigned long)n;
 
 	/* Keep valgrind happy.*/
 	msg.args[3] = 0;

Modified: trunk/nfsim/core/nfsockopt.h
===================================================================
--- trunk/nfsim/core/nfsockopt.h	2005-01-06 16:57:37 UTC (rev 3579)
+++ trunk/nfsim/core/nfsockopt.h	2005-01-07 03:04:15 UTC (rev 3580)
@@ -45,7 +45,7 @@
 	int len;
 
 	/* syscall/kernelop arguments */
-	int args[MAX_MESSAGE_ARGS];
+	unsigned long args[MAX_MESSAGE_ARGS];
 
 	/* return val of the syscall/kernelop */
 	int retval;

Modified: trunk/nfsim/kernelenv/include/kernelenv.h
===================================================================
--- trunk/nfsim/kernelenv/include/kernelenv.h	2005-01-06 16:57:37 UTC (rev 3579)
+++ trunk/nfsim/kernelenv/include/kernelenv.h	2005-01-07 03:04:15 UTC (rev 3580)
@@ -103,7 +103,7 @@
 
 #define __init
 #define __inline
-#define ____cacheline_aligned
+#define ____cacheline_aligned __attribute__((aligned(8)))
 
 #include <talloc.h>
 extern void *__vmalloc_ctx;