Changeset 632

Timestamp:

10/05/08 16:09:24 (3 months ago)

Author:

ftx

Message:

fixe for segfault in case of missing /proc/modules
Closes: #227

Location:

trunk/daemon/src

Files:

• bandwidth.c (modified) (3 diffs)
• bandwidth.h (modified) (1 diff)
• misc.c (modified) (1 diff)
• traffic.c (modified) (2 diffs)

trunk/daemon/src/bandwidth.c

@@ -18 +18 @@
 
 
+#include <string.h>
+
 #include "main.h"
 #include "misc.h"
@@ -23 +25 @@
 #include "request.h"
 #include "error.h"
+
+#include "fs.h"
 
 
@@ -321 +325 @@
 
 
-
+int ifb_kernel_support()
+{
+        char *devsfile = file_read("/proc/net/dev");
+        int ret = 0;
+        
+        if(devsfile != NULL)
+        {
+                if(strstr(devsfile, "ifb") != NULL)
+                        ret = 1;
+        }
+        
+        free(devsfile);
+        
+        return ret;
+}

trunk/daemon/src/bandwidth.h

@@ -30 +30 @@
         struct ovcp_response_st *del_bandwidth(struct ovcp_request_st *request);
         
+        int ifb_kernel_support();
+        
 #endif

trunk/daemon/src/misc.c

@@ -747 +747 @@
 
         modfile = fopen("/proc/modules", "r");
-
+        if(modfile == NULL)
+                return 0;
+                
         while(!feof(modfile))
         {

trunk/daemon/src/traffic.c

@@ -530 +530 @@
         sqlite3_exec(openvcp_db, "CREATE TABLE vserver_trafficlimit ('id' INTEGER PRIMARY KEY AUTOINCREMENT, 'name', 'total', 'notify', 'type', 'notified', UNIQUE(name, type))", NULL, 0, NULL);
 
-        system("modprobe ifb 2>/dev/null");     
-        
-        system("modprobe ip_tables 2>/dev/null");
-        if(kernelmodule_loaded("ip_tables"))
-        {
-                ovcp_create_chains();
-                ovcp_create_tables(openvcp_db);
-        }
-        else  ovcp_log(OVCP_WARNING, "ip_tables Kernel Module not found");
-        
-        system("modprobe nf_conntrack_ftp 2>/dev/null");
+        execb_cmd("modprobe", "modprobe", "ifb", NULL); 
+        
+        execb_cmd("modprobe", "modprobe", "ip_tables", NULL);
+
+        ovcp_create_chains();
+        ovcp_create_tables(openvcp_db);
+
+        execb_cmd("modprobe", "modprobe", "nf_conntrack_ftp", NULL);
+
         
         ifaces = split_string(global_settings.ifaces, ' ', &iface_count);
@@ -604 +602 @@
                 }               
                 
-                if(kernelmodule_loaded("ifb"))
+                if(ifb_kernel_support())
                         ovcp_setup_trafficthrottling(openvcp_db);
                 else  ovcp_log(OVCP_WARNING, "ifb Kernel Module not found");