[Commits] r712 - trunk/daemon/src

[new-commit at lists.openvcp.org]

Author: ftx
Date: 2010-02-05 20:58:48 +0000 (Fri, 05 Feb 2010)
New Revision: 712

Modified:
   trunk/daemon/src/set.c
   trunk/daemon/src/setup.c
Log:
fix for mem leak


Modified: trunk/daemon/src/set.c
===================================================================
--- trunk/daemon/src/set.c	2010-01-31 18:42:51 UTC (rev 711)
+++ trunk/daemon/src/set.c	2010-02-05 20:58:48 UTC (rev 712)
@@ -878,13 +878,15 @@
 		snprintf(path, BUF_SIZE, "%s/%s/scripts/post-start", global_settings.config_dir, name);
 		file_write_many(path, "route del -net ", inet_ntoa(network), " netmask ", mask, " gw ", peer, "\nexit 0\n", NULL);
 
-                if(!dir_exist(concat(global_settings.root_dir, "/", name, "/dev", NULL)))
+		sconcat(path, BUF_SIZE, global_settings.root_dir, "/", name, "/dev", NULL);
+                if(!dir_exist(path))
 		{
-			mkdir(concat(global_settings.root_dir, "/", name, "/dev", NULL), 0755);
+			mkdir(path, 0755);
 		}
-		if(!dir_exist(concat(global_settings.root_dir, "/", name, "/dev/net", NULL)))
+		sconcat(path, BUF_SIZE, global_settings.root_dir, "/", name, "/dev/net", NULL);
+		if(!dir_exist(path))
 		{
-			mkdir(concat(global_settings.root_dir, "/", name, "/dev/net", NULL), 0755);
+			mkdir(path, 0755);
 		}
 
    		sconcat(path, BUF_SIZE, global_settings.root_dir, "/", name, "/dev/net/tun", NULL);

Modified: trunk/daemon/src/setup.c
===================================================================
--- trunk/daemon/src/setup.c	2010-01-31 18:42:51 UTC (rev 711)
+++ trunk/daemon/src/setup.c	2010-02-05 20:58:48 UTC (rev 712)
@@ -243,13 +243,18 @@
 	}
    	if(tun == 1)
    	{
-		if(!dir_exist(concat(global_settings.root_dir, "/", name, "/dev", NULL)))
+   		sconcat(path, BUF_SIZE, global_settings.root_dir, "/", name, "/dev", NULL);
+   		
+		if(!dir_exist(path))
 		{
-			mkdir(concat(global_settings.root_dir, "/", name, "/dev", NULL), 0755);
+			mkdir(path, 0755);
 		}
-		if(!dir_exist(concat(global_settings.root_dir, "/", name, "/dev/net", NULL)))
+		
+		sconcat(path, BUF_SIZE, global_settings.root_dir, "/", name, "/dev/net", NULL);
+		
+		if(!dir_exist(path))
 		{
-			mkdir(concat(global_settings.root_dir, "/", name, "/dev/net", NULL), 0755);
+			mkdir(path, 0755);
 		}
 
    		sconcat(path, BUF_SIZE, global_settings.root_dir, "/", name, "/dev/net/tun", NULL);