[netfilter-cvslog] r3511 - in trunk/nfsim: core kernelenv kernelenv/include

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2004-12-29 12:45:04 +0100 (Wed, 29 Dec 2004)
New Revision: 3511

Modified:
   trunk/nfsim/core/message.c
   trunk/nfsim/kernelenv/include/kernelenv.h
   trunk/nfsim/kernelenv/kernelenv.c
Log:
request_module() support for kmod cleanup patches.
strace support for revision sockopts.


Modified: trunk/nfsim/core/message.c
===================================================================
--- trunk/nfsim/core/message.c	2004-12-29 11:44:06 UTC (rev 3510)
+++ trunk/nfsim/core/message.c	2004-12-29 11:45:04 UTC (rev 3511)
@@ -192,6 +192,9 @@
 		switch (opt) {
 		case IPT_SO_GET_INFO: return "GET_INFO";
 		case IPT_SO_GET_ENTRIES: return "GET_ENTRIES";
+		/* Old headers don't define IPT_SO_GET_REVISION_MATCH etc. */
+		case IPT_SO_GET_ENTRIES+1: return "GET_REVISION_MATCH";
+		case IPT_SO_GET_ENTRIES+2: return "GET_REVISION_TARGET";
 		}
 	} else {
 		switch (opt) {
@@ -244,6 +247,8 @@
 		case -EPIPE: strcpy(errstr, "-EPIPE"); break;
 		case -EDOM: strcpy(errstr, "-EDOM"); break;
 		case -ERANGE: strcpy(errstr, "-ERANGE"); break;
+		case -EPROTONOSUPPORT: strcpy(errstr, "-EPROTONOSUPPORT"); break;
+		case -ENOPROTOOPT: strcpy(errstr, "-ENOPROTOOPT"); break;
 		default:
 			barf("Unknown error %i!\n", -err);
 		}

Modified: trunk/nfsim/kernelenv/include/kernelenv.h
===================================================================
--- trunk/nfsim/kernelenv/include/kernelenv.h	2004-12-29 11:44:06 UTC (rev 3510)
+++ trunk/nfsim/kernelenv/include/kernelenv.h	2004-12-29 11:45:04 UTC (rev 3511)
@@ -1015,6 +1015,8 @@
 
 #define module_put(x) 
 #define try_module_get(x) 1
+#define try_then_request_module(x, mod...) ((x) ?: (request_module(mod), (x)))
+extern int request_module(const char * name, ...) __attribute__ ((format (printf, 1, 2)));
 
 struct __module_init { 
 	int (*initcall)(void);

Modified: trunk/nfsim/kernelenv/kernelenv.c
===================================================================
--- trunk/nfsim/kernelenv/kernelenv.c	2004-12-29 11:44:06 UTC (rev 3510)
+++ trunk/nfsim/kernelenv/kernelenv.c	2004-12-29 11:45:04 UTC (rev 3511)
@@ -948,6 +948,11 @@
 	return jhash_3words(a, 0, 0, initval);
 }
 
+int request_module(const char * name, ...)
+{
+	return 0;
+}
+
 void kernelenv_init(void)
 {
 	__vmalloc_ctx = talloc_named_const(nfsim_tallocs, 1, "vmallocs");