From 55705dc89a83cdda1f804ee8eeeb9fea8de7d948 Mon Sep 17 00:00:00 2001
From: dvserg <dv_serg@mail.ru>
Date: Tue, 12 May 2009 17:42:45 +0400
Subject: Havp RAMdisk bug fixed. Signed-off-by: dvserg <dv_serg@mail.ru>

---
 config/havp/havp.inc | 31 ++++++++++++++-----------------
 pkg_config.7.xml     |  2 +-
 pkg_config.8.xml     |  2 +-
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/config/havp/havp.inc b/config/havp/havp.inc
index 14e75484..2505ce0b 100644
--- a/config/havp/havp.inc
+++ b/config/havp/havp.inc
@@ -184,13 +184,15 @@ function havp_install()
 function havp_deinstall()
 {
     havp_setup_cron(HVDEF_CLAM_UPD_CRONNAME,"", "");
+    mwexec("killall -9 havp");
     mwexec("rm -rf " . HVDEF_HAVP_STARTUP_SCRIPT);
-    mwexec("rm -rf " . HVDEF_CLAM_STARTUP_SCRIPT);
-    mwexec("rm -rf " . HVDEF_AVUPD_SCRIPT);
     mwexec("rm -rf " . HVDEF_FILTER_RESYNC_SCRIPT);
     mwexec("rm -rf " . HVDEF_PID_FILE);
-    mwexec("rm -rf " . HVDEF_CLAM_PID);
-    mwexec("rm -rf " . HVDEF_CLAM_SOCKET);
+#    mwexec("rm -rf " . HVDEF_CLAM_STARTUP_SCRIPT);
+#    mwexec("rm -rf " . HVDEF_AVUPD_SCRIPT);
+#    mwexec("rm -rf " . HVDEF_CLAM_PID);
+#    mwexec("rm -rf " . HVDEF_CLAM_SOCKET);
+    umountRAMDisk();
 }
 # ==============================================================================
 # Events
@@ -1282,17 +1284,12 @@ function mountRAMdisk($free_and_mount = true)
     # =-= Temp RAMDisk =-=
     # note: use 1/4 of system memory capacity
     $ramdisk_capacity = get_memory();
-    $ramdisk_capacity = intval($ramdisk_capacity[0]) / 4; # [Mb]
-
-    # check RAMDisk for exists and capacity
-	if (file_exists($mnt_flag_file)) {
-		$old_ramdisk_size = trim(file_get_contents($mnt_flag_file));
-		# RAMDisk exists - not need create new
-		if (intval($ramdisk_size) === intval($old_ramdisk_size)) return;
-    }
+    $ramdisk_capacity = intval(intval($ramdisk_capacity[0]) / 4); # [Mb]
 
+    # RAMDisk already exists?
+    if (file_exists("/dev/md10")) return;
     # umount old RAMDisk
-    umountRAMDisk();
+#    umountRAMDisk();
 
     # create and mount a swap backed file system on /var/tmp/havp by /dev/md10:
 # SWAP
@@ -1300,11 +1297,11 @@ function mountRAMdisk($free_and_mount = true)
 #    mwexec("newfs -U /dev/md10");
 #    mwexec("mount /dev/md10 $mnt_point");
 # RAM - more quickly, used physical RAM
-    mwexec("/sbin/mdmfs -s {$ramdisk_capacity}M md10 $mnt_point");
-    mwexec("chmod 1777 $mnt_point");
+    mwexec("/sbin/mdmfs -s {$ramdisk_capacity}M md10 {$mnt_point}");
+    mwexec("chmod 1777 {$mnt_point}");
 
     # create flag file
-    file_put_contents($mnt_flag_file, "$ramdisk_capacity");
+    file_put_contents($mnt_flag_file, "{$ramdisk_capacity}");
     # syslog
     if (HV_DEBUG === 'true')
         log_error("havp: Create RAMDisk {$ramdisk_capacity}Mb.");
@@ -1433,7 +1430,7 @@ function havp_fix()
     if (isset($config['installedpackages']['menu'])) {
         foreach($config['installedpackages']['menu'] as $mkey => $mval) {
         	if ($mval['name'] === 'HTTP Antivirus') {
-        		unset($config['installedpackages']['menu'][$key]);
+        		unset($config['installedpackages']['menu'][$mkey]);
                 write_config('Fix HAVP menu.');
                 break;
         	}
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 49d70269..98fd4092 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -638,7 +638,7 @@
       <category>Network Management</category> 
       <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url> 
       <depends_on_package>havp-0.88.tbz</depends_on_package>
-      <version>0.88_04</version> 
+      <version>0.88_05</version> 
       <status>ALPHA</status> 
       <required_version>1.2.2</required_version> 
       <config_file>http://www.pfsense.com/packages/config/havp/havp.xml</config_file> 
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index b620e25e..068eaaf4 100755
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -638,7 +638,7 @@
       <category>Network Management</category> 
       <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url> 
       <depends_on_package>havp-0.88.tbz</depends_on_package>
-      <version>0.88_04</version> 
+      <version>0.88_05</version> 
       <status>ALPHA</status> 
       <required_version>1.2.2</required_version> 
       <config_file>http://www.pfsense.com/packages/config/havp/havp.xml</config_file> 
-- 
cgit v1.2.3