X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fauth.phh;h=a501014605c1939fe1cb8e89e3e67f14454d9228;hb=0e94d4cdb397ece2f2f23920aeb8ce97586a0da4;hp=c96a0905ecf56b274f8d31c075bcc5a7ae8e93f9;hpb=efe073ca460ec29111cf35dfb760016bea4a7dc5;p=brisk.git

diff --git a/web/Obj/auth.phh b/web/Obj/auth.phh
index c96a090..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 {
@@ -165,11 +165,9 @@ class Challenges {
     function load_data() 
         {
             GLOBAL $sess;
-            $doexit = FALSE;
             do {
                 if (($tok = @ftok(FTOK_PATH."/challenges", "B")) == -1) {
                     log_main("ftok failed");
-                    $doexit = TRUE;
                     break;
                 }
     
@@ -181,7 +179,7 @@ class Challenges {
                     $shm_sz = CHAL_SHM_DIMS_MIN;
 
                 if ($shm = shm_attach($tok, $shm_sz)) {
-                    $chals = @shm_get_var($shm, $tok);
+                    $chals = @shm_get_var($shm, $tok); // CHECKED BELOW
 	
                     log_only("challenges ==  ".($chals == FALSE ?   "FALSE" : "TRUE")."  challenges ===  ".($chals === FALSE ? "FALSE" : "TRUE")."  challenges isset ".(isset($chals) ?   "TRUE" : "FALSE"));
 	
@@ -193,6 +191,7 @@ class Challenges {
                             log_only("PUT_VAR FALLITA ".strlen(serialize($chals)));
                             log_only(serialize($chals));
                         }
+                        log_shme("Challenges::save_data2");
                     }
                     $chals->shm_sz = $shm_sz;
 	
@@ -204,9 +203,6 @@ class Challenges {
                 return ($chals);
             } while (0);
     
-            if ($doexit)
-                exit();
-    
             return (FALSE);
         }
   
@@ -227,7 +223,8 @@ class Challenges {
                 log_only("challenges count ".count($chals->item)."  _n: ".$chals->item_n);
 
             $chals->mod = FALSE;
-            if (shm_put_var($shm, $tok, $chals) != FALSE) {
+            if (@shm_put_var($shm, $tok, $chals) != FALSE) {
+                log_shme("Challenges::save_data");
                 shm_detach($shm);
                 return (TRUE);
             }
@@ -247,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