[netfilter-cvslog] r3579 - trunk/nfsim/tools

[gandalf at netfilter.org]

Author: gandalf at netfilter.org
Date: 2005-01-06 17:57:37 +0100 (Thu, 06 Jan 2005)
New Revision: 3579

Modified:
   trunk/nfsim/tools/module.c
Log:
Make sure the "running" timers are actually run before we call the exit() function of module.
Otherwise unloading a conntrack helper and conntrack itself might fail when run with --failtest and there exists waiting expectations.


Modified: trunk/nfsim/tools/module.c
===================================================================
--- trunk/nfsim/tools/module.c	2005-01-06 05:35:28 UTC (rev 3578)
+++ trunk/nfsim/tools/module.c	2005-01-06 16:57:37 UTC (rev 3579)
@@ -222,6 +222,8 @@
 	list_for_each_entry_reverse(mod, &modules, list) {
 		if (!mod->state)
 			continue;
+		/* Make sure "running" timers are actually run */
+		schedule();
 		mod->exit();
 		mod->state = 0;
 	}
@@ -250,6 +252,8 @@
 		nfsim_log(LOG_UI, "Module %s not loaded.", argv[1]);
 		return false;
 	}
+	/* Make sure "running" timers are actually run */
+	schedule();
 	mod->exit();
 	mod->state = 0;
 	return true;