[hipl-commit] [trunk] Rev 4377: Add hip_remove_kernel_modules.

From: Mircea Gherzan <mircea.gherzan@xxxxxxxxxxxxxx>
To: hipl-commit@xxxxxxxxxxxxx
Date: Wed, 21 Apr 2010 02:29:19 +0300

Committer: Mircea Gherzan <mircea.gherzan@xxxxxxxxxxxxxx>
Date: 21/04/2010 at 02:29:19
Revision: 4377
Revision-id: mircea.gherzan@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  Add hip_remove_kernel_modules.

Modified:
  M  hipd/init.c

=== modified file 'hipd/init.c'
--- hipd/init.c 2010-04-20 23:07:21 +0000
+++ hipd/init.c 2010-04-20 23:29:00 +0000
@@ -38,6 +38,9 @@
  */
 #define HIP_DAEMON_LOCK_FILE     HIPL_LOCKDIR    "/hipd.lock"
 
+/** Maximum size of a modprobe command line */
+#define MODPROBE_MAX_LINE       64
+
 /* the /etc/hip/dhtservers file */
 #define HIPL_DHTSERVERS_FILE     HIPL_SYSCONFDIR "/dhtservers"
 
@@ -288,7 +291,7 @@
 static int hip_probe_kernel_modules(void)
 {
     int count;
-    char cmd[64];
+    char cmd[MODPROBE_MAX_LINE];
     int net_total, crypto_total;
 
     net_total    = sizeof(kernel_net_mod) / sizeof(kernel_net_mod[0]);
@@ -326,6 +329,28 @@
 }
 
 /**
+ * Cleanup/unload the kernel modules on hipd exit.
+ * Unused for now because of unprivileged executions.
+ * @todo Make hip_exit call it with root privileges in order to clean up.
+ */
+static void __attribute__((unused)) hip_remove_kernel_modules(void) {
+    char **mods[] = {kernel_crypto_mod, kernel_net_mod};
+    char cmd[MODPROBE_MAX_LINE];
+    int count[2], type, i;
+
+    count[0] = sizeof(kernel_crypto_mod) / sizeof(kernel_crypto_mod[0]);
+    count[1] = sizeof(kernel_net_mod) / sizeof(kernel_net_mod[0]);
+
+    for (type = 0; type < 2; type++) {
+        for (i = 0; i < count[type]; i++) {
+            HIP_DEBUG("Removing %s\n", mods[type][i]);
+            snprintf(cmd, sizeof(cmd), "/sbin/modprobe -r %s", mods[type][i]);
+            system(cmd);
+        }
+    }
+}
+
+/**
  * initialize the needed variables for DHT
  *
  * @return zero on success or negative on failure

[hipl-commit] [trunk] Rev 4377: Add hip_remove_kernel_modules.

Other related posts: