[netfilter-cvslog] r3377 - in trunk: nfsim/core nfsim-testsuite

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2004-12-14 07:21:59 +0100 (Tue, 14 Dec 2004)
New Revision: 3377

Modified:
   trunk/nfsim-testsuite/test.sh
   trunk/nfsim/core/core.c
Log:
Remove "-a", make loading all modules the default. "--no-modules" suppresses this.
My first two users stumbled over this 8)


Modified: trunk/nfsim/core/core.c
===================================================================
--- trunk/nfsim/core/core.c	2004-12-14 06:11:10 UTC (rev 3376)
+++ trunk/nfsim/core/core.c	2004-12-14 06:21:59 UTC (rev 3377)
@@ -152,18 +152,18 @@
 	{"echo",   0, 0, 'x'},
 	{"quiet",  0, 0, 'q'},
 	{"exit",  0, 0, 'e'},
-	{"load-all",  0, 0, 'a'},
+	{"no-modules",  0, 0, 'N'},
 	{"version",  0, 0, 'V'},
 	{0,        0, 0, 0 }
 };
 
 int main(int argc, char **argv)
 {
-	int termfd, load_all = 0;
+	int termfd, load_modules = 1;
 	char c;
 	char *p;
 
-	while ((c = getopt_long(argc, argv, "xqeaV", options, NULL)) != EOF) {
+	while ((c = getopt_long(argc, argv, "xqeNV", options, NULL)) != EOF) {
 		switch (c) {
 		case 'x':
 			tui_echo_commands = 1;
@@ -174,8 +174,8 @@
 		case 'e':
 			tui_abort_on_fail = 1;
 			break;
-		case 'a':
-			load_all = 1;
+		case 'N':
+			load_modules = 0;
 			break;
 		case 'V':
 			printf("nfsim version %s\nkernel version %s\n",
@@ -221,7 +221,7 @@
 
 	netfilter_init();
 
-	if (load_all && !load_all_modules())
+	if (load_modules && !load_all_modules())
 		barf("Module loading failed\n");
 
 	nf_register_queue_handler(PF_INET, enqueue_packet, NULL);

Modified: trunk/nfsim-testsuite/test.sh
===================================================================
--- trunk/nfsim-testsuite/test.sh	2004-12-14 06:11:10 UTC (rev 3376)
+++ trunk/nfsim-testsuite/test.sh	2004-12-14 06:21:59 UTC (rev 3377)
@@ -22,7 +22,7 @@
     esac
 done
 
-NFSIM_ARGS="$NFSIM_ARGS -e -a"
+NFSIM_ARGS="$NFSIM_ARGS -e"
 KVERSION=`echo version kernel | $NFSIM -q`
 
 # Creates a temporary file and exports the name of the file to