X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fauth.phh;h=a501014605c1939fe1cb8e89e3e67f14454d9228;hb=525cfe7d868bfaefdde9f769f52a50bcb6f1e9e9;hp=061538872eb99844d92ca2977800eb5d57768952;hpb=aff81ded58cbc8ce9678a56b634448b35e2ea804;p=brisk.git

diff --git a/web/Obj/auth.phh b/web/Obj/auth.phh
index 0615388..a501014 100644
--- a/web/Obj/auth.phh
+++ b/web/Obj/auth.phh
@@ -24,11 +24,11 @@
 
 require_once("${G_base}Obj/dbase_${G_dbasetype}.phh");
 
-define(CHAL_SHM_DIMS_MIN, 16384);
-define(CHAL_SHM_DIMS_MAX, 65536);
-define(CHAL_SHM_DIMS_DLT, 16384);
-define(CHAL_VALID_TIME,      15);
-define(CHAL_GARBAGE_TIMEOUT,  5);
+define('CHAL_SHM_DIMS_MIN', 16384);
+define('CHAL_SHM_DIMS_MAX', 65536);
+define('CHAL_SHM_DIMS_DLT', 16384);
+define('CHAL_VALID_TIME',      15);
+define('CHAL_GARBAGE_TIMEOUT',  5);
 
 
 class Challenge {
@@ -244,31 +244,25 @@ class Challenges {
         return (FALSE);
     }
 
-    function lock_data()
+    static function lock_data($is_exclusive)
     {
-        if (($tok = @ftok(FTOK_PATH."/challenges", "B")) == -1) {
-            return (FALSE);
-        }
-        // echo "FTOK ".$tok."<br>";
-        if (($res = sem_get($tok)) == FALSE) {
-            return (FALSE);
-        }
-        if (sem_acquire($res)) {   
-            self::$delta_t = microtime(TRUE);
-            log_lock("LOCK   challenges   [".self::$delta_t."]");
-            return ($res);
-        }
-        else
-            return (FALSE);
+      if (($res = file_lock(FTOK_PATH."/challenges", $is_exclusive)) != FALSE) {
+          self::$delta_t = microtime(TRUE);
+          log_lock("LOCK   challenges   [".self::$delta_t."]");
+          
+          return ($res);
+      }
+
+      return (FALSE);
     }
   
-    function unlock_data($res)
+    static function unlock_data($res)
     {
         GLOBAL $sess; 
     
         log_lock("UNLOCK challenges   [".(microtime(TRUE) - (self::$delta_t))."]");
 
-        return (sem_release($res));
+        file_unlock($res);
     }
 } // End CLASS Challenges