X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbrisk.phh;h=589eed9a87386d1a29e7e11121cc2eca79e36f74;hb=6215f77e418ed06e4822895bf644b585d32ba959;hp=9a931c018e4bfcac080ab429c02ae286d09f7702;hpb=631b34bf11b3ab5d2d5b9fc90f95bfa87802a33e;p=brisk.git

diff --git a/web/brisk.phh b/web/brisk.phh
index 9a931c0..589eed9 100644
--- a/web/brisk.phh
+++ b/web/brisk.phh
@@ -2,7 +2,7 @@
 /*
  *  brisk - brisk.phh
  *
- *  Copyright (C) 2006 matteo.nastasi@milug.org
+ *  Copyright (C) 2006-2007 matteo.nastasi@milug.org
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,10 +21,12 @@
 
 define(FTOK_PATH, "/var/lib/brisk");
 define(LEGAL_PATH, "/tmp/legal_brisk");
+define(PROXY_PATH, "/var/lib/brisk_proxy");
 define(TABLES_N, 8);
 define(PLAYERS_N, 3);
 define(MAX_POINTS, 5);
-define(MAX_PLAYERS, (PLAYERS_N * TABLES_N));
+define(MAX_PLAYERS, (20 + (PLAYERS_N * TABLES_N)));
+define(SHM_DIMS, (50000 * MAX_PLAYERS));
 define(COMM_N, 12);
 define(COMM_GEN_N, 50);
 define(SESS_LEN, 13);
@@ -39,9 +41,9 @@ define(BRISK_DEBUG, FALSE);
 // define(DEBUGGING, "local");
 
 $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "0.6.1";
+$G_brisk_version = "0.7.2";
 
-$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: log per il tracciamento di eventuali illeciti.',
+$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: ottimizzazione della CPU e chiuso il bug di mancato cambio pagina.',
                         'Se vuoi iscriverti alla <a target="_blank" href="http://www.milug.org/cgi-bin/mailman/listinfo/ml-briscola">Mailing List</a>, cliccala!' );
 $table_wellarr = Array ( 'Benvenuto al tavolo. Se almeno tre giocatori non sbloccano l\'uscita cliccando il lucchetto, chi esce non pu&ograve; risedersi a un qualunque tavolo per '.floor(BAN_TIME/60).' minuti.');
 
@@ -53,7 +55,6 @@ Questa &egrave; un\'implementazione della briscola in cinque, cos&igrave; come &
 <a target=\\"_blank\\" href=\\"http://it.wikipedia.org/wiki/Briscola#Gioco_a_5\\">Wikipedia</a>; in breve &egrave; la variante con l\'asta prima sulla carta e poi sui punti.<br><br>
 <b>Configurazione del browser.</b><br>
 Occorre abilitare i cookies.<br>
-Se usate Internet Explorer dovete anche settare: strumenti->cronologia_esplorazioni->impostazioni ad \\"apertura alla pagina web\\".<br>
 <br>
 <b>Uso del sito</b><br>
 Potete sedervi a un tavolo o rimanere in piedi.<br>
@@ -103,13 +104,13 @@ class Card {
   function Card($value, $stat, $owner)
   {
     $this->value = $value;
-    $this->stat  = $stat;
+    $this->stat  = $stat; // Card stat
     $this->owner = $owner;
   }
 
   function assign($stat,$owner)
   {
-    $this->stat  = $stat;
+    $this->stat  = $stat; // Card stat
     $this->owner = $owner;
   }
 
@@ -120,14 +121,14 @@ class Card {
 
   function play($x,$y)
   {
-    $this->stat = 'table';
+    $this->stat = 'table'; // Card stat
     $this->x = $x;
     $this->y = $y;
   }
 
   function take($newown)
   {
-    $this->stat = 'take';
+    $this->stat = 'take'; // Card stat
     $this->owner = $newown;
   }
 }
@@ -190,10 +191,11 @@ class Table {
     $ret = array();
 
     for ($i = 0 ; $i < 40 ; $i++) {
-      $ret[$i] = new Card($i, 'bunch', 'no_owner');
+      $ret[$i] =& new Card($i, 'bunch', 'no_owner');
     }
 
-    return ($ret);
+    $oret = &$ret;
+    return ($oret);
   }
 
   function bunch_make()
@@ -349,6 +351,7 @@ class Table {
 class User {
   var $name;       // name of the user
   var $sess;       // session of the user
+  var $ip;         // ip of the user
   var $lacc;       // last access (for the cleanup)
   var $laccwr;     // last access (for the cleanup)
   var $bantime;    // timeout to temporary ban
@@ -364,9 +367,10 @@ class User {
   var $table;      // id of the current table (if in table state)
   var $table_pos;  // idx on the table
 
-  function User($name, $sess, $stat = "", $subst = "", $table = -1) {
+  function User($name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") {
     $this->name  = $name;
     $this->sess  = $sess;
+    $this->ip    = $ip;
     $this->lacc   = time();
     $this->laccwr = time();
     $this->bantime = 0;
@@ -379,11 +383,82 @@ class User {
     $this->asta_pnt  = -1;
     $this->handpt = -1;
     $this->exitislock = TRUE;
-
+    
     $this->table = $table;
   }
+
+  function stat_set($stat) {
+    $this->stat = "$stat";
+    
+    /*
+    if (validate_sess($this->sess)) {
+      $fp = fopen(PROXY_PATH."/".$this->sess.".stat", 'w');
+      fwrite($fp, sprintf("%s\n",$this->stat));
+      fclose($fp);
+    }
+    */
+  }
+
+  function step_set($step) {
+    $this->step = $step;
+    
+    do {
+      if (validate_sess($this->sess) == FALSE)
+	break;
+      if (($fp = @fopen(PROXY_PATH."/".$this->sess.".step", 'w')) == FALSE)
+	break;
+      fwrite($fp, pack("l",$this->step), 4);
+      fclose($fp);
+    } while (0);
+  }
+
+  function step_inc() {
+    $this->step++;
+    
+    if (validate_sess($this->sess)) {
+      $fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w');
+      fwrite($fp, pack("l",$this->step), 4);
+      fclose($fp);
+    }
+  }
+}
+
+function step_get($sess) {
+  $fp = FALSE;
+  $ct = 0;
+  do {
+    if (validate_sess($sess) == FALSE)
+      break;
+  $ct = 1;
+    if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE)
+      break;
+  $ct = 2;
+    if (($s = fread($fp, 4)) == FALSE)
+      break;
+  $ct = 3;
+    if (strlen($s) != 4)
+      break;
+  $ct = 4;
+    $arr = unpack('l', $s);
+    fclose($fp);
+
+    // log_rd2($sess, "A0: ".$arr[0]."  A1: ".$arr[1]);
+    return ($arr[1]);
+  } while (0);
+
+  if ($fp != FALSE)
+    fclose($fp);
+
+  log_rd2($sess, "STEP_GET: return false ".$ct);
+  return (FALSE);
+}
+
+function step_unproxy($sess) {
+  log_rd2($sess, "UNPROXY: ".PROXY_PATH."/".$sess.".step");
+  @unlink(PROXY_PATH."/".$sess.".step");
 }
 
+
 class brisco {
   var $user;
   var $table;
@@ -395,10 +470,10 @@ class brisco {
     $this->user = array();
 
     for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
-      $this->user[$i] = new User("", "");
+      $this->user[$i] =& new User("", "");
     }
     for ($i = 0 ; $i < TABLES_N ; $i++) 
-      $this->table[$i] = new Table();
+      $this->table[$i] =& new Table();
     $this->garbage_timeout = 0;
   }
 
@@ -420,7 +495,9 @@ class brisco {
 	  if ($user_cur->stat == 'table' || $user_cur->stat == 'room') {
 	    log_auth($user_cur->sess, "Autologout session.");
 	    
+	    $tmp_sess = $user_cur->sess;
 	    $user_cur->sess = "";
+	    step_unproxy($tmp_sess);
 	    $user_cur->name = "";
 	    $user_cur->the_end = FALSE;
 	    
@@ -439,7 +516,7 @@ class brisco {
 	    $this->room_wakeup(&$user_cur);
 	    $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
 	    $user_cur->comm[$user_cur->step % COMM_N] .=  show_notify("<br>Sei stato inattivo per ".(EXPIRE_TIME_SMAMMA/60.0)." minuti. <br><br>Quindi ritorni tra i <b>Giocatori in piedi</b>.", 0, "torna ai tavoli", 400, 100);
-	    $user_cur->step++;
+	    $user_cur->step_inc();
 	  }
 	}
       }
@@ -447,6 +524,9 @@ class brisco {
       
       $this->garbage_timeout = time() + GARBAGE_TIMEOUT;
     }
+
+    // BAN_IP_CLEAN
+
   }
 
 
@@ -468,12 +548,12 @@ class brisco {
 	log_main("PREIMPOST", "INLOOP name: ".$user_cur->name);
 
 	if ($user_cur != $user) {
-	  $user_cur->stat = "room";
+	  $user_cur->stat_set("room");
 	  $user_cur->subst = "sitdown";
 	  $user_cur->laccwr = $curtime;
 	}
 	else if ($user->sess != "") {
-	  $user_cur->stat = "room";
+	  $user_cur->stat_set("room");
 	  $user_cur->subst = "standup";
 	  $user_cur->laccwr = $curtime;
 	  $user_cur->table = -1;
@@ -481,7 +561,7 @@ class brisco {
       }
     }
     else {
-      $user->stat = "room";
+      $user->stat_set("room");
       $user->subst = "standup";
       $user->laccwr = $curtime;
     }
@@ -527,7 +607,7 @@ class brisco {
       }
       log_wr($user_cur->sess, "ROOM_WAKEUP: ".$ret);
       $user_cur->comm[$user_cur->step % COMM_N] = $ret;
-      $user_cur->step++;
+      $user_cur->step_inc();
     }
   }
   
@@ -562,7 +642,7 @@ class brisco {
 	$ret .= sprintf('$("myname").innerHTML = "<b>%s</b>: ";',  xcape($user->name));
       }
       $user_cur->comm[$user_cur->step % COMM_N] = $ret;
-      $user_cur->step++;
+      $user_cur->step_inc();
     }
 
     log_main("table_update", "post");
@@ -601,7 +681,7 @@ class brisco {
 	}
       }
       $user_cur->comm[$user_cur->step % COMM_N] = $ret;
-      $user_cur->step++;
+      $user_cur->step_inc();
     }
   }
 
@@ -622,7 +702,7 @@ class brisco {
       if (($name_new = validate_name(substr($user_mesg, 6))) == FALSE) {
 	  $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
 	  $user->comm[$user->step % COMM_N] .= sprintf('chatt_sub("%s","Il nickname deve contenere almeno una lettera o una cifra.");', $dt.NICKSERV, xcape($name_new));
-	  $user->step++;
+	  $user->step_inc();
 
 	  return;
       }
@@ -639,7 +719,7 @@ class brisco {
 	if ($user_cur->name == $name_new) {
 	  $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
 	  $user->comm[$user->step % COMM_N] .= sprintf('chatt_sub("%s","Nickname <b>%s</b> gi&agrave; in uso.");', $dt.NICKSERV, xcape($name_new));
-	  $user->step++;
+	  $user->step_inc();
 	  break;
 	}
       }
@@ -681,7 +761,7 @@ class brisco {
 	    if ($user_cur == $user)
 	      $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('$("myname").innerHTML = "<b>%s</b>";', 
 								   xcape($user->name,ENT_COMPAT,"UTF-8"));
-	    $user_cur->step++;
+	    $user_cur->step_inc();
 	  }
 	}
       }
@@ -700,7 +780,7 @@ class brisco {
 	$user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
 	$user_cur->comm[$user_cur->step % COMM_N] .= sprintf('chatt_sub("%s","%s");',
 							     $dt.xcape($user->name), xcape($user_mesg));
-	$user_cur->step++;
+	$user_cur->step_inc();
       }
       log_legal($timecur, $user->sess, $user->name, 
 		($user->stat == 'room' ? 'room' : 'table '.$user->table),$user_mesg);
@@ -710,13 +790,14 @@ class brisco {
   function &get_user($sess, &$idx)
   {
     GLOBAL $PHP_SELF;
-    
-    if (strlen($sess) == SESS_LEN) {
+
+    if (validate_sess($sess)) {
       for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
 	if (strcmp($sess, $this->user[$i]->sess) == 0) {
 	  // find it
 	  $idx = $i;
-	  return ($this->user[$i]);
+	  $ret = &$this->user[$i];
+	  return ($ret);
 	}
       }
       log_main($sess, sprintf("get_user: Wrong sess from page [%s]",$PHP_SELF));
@@ -730,7 +811,7 @@ class brisco {
   }
 
   /*
-   * function &add_user(&$bri, &$sess, &$idx, $name)
+   * function &add_user(&$bri, &$sess, &$idx, $name, $ip)
    *
    * RETURN VALUE:
    *   if ($idx != -1 && ret == FALSE)  =>  duplicated nick
@@ -738,7 +819,7 @@ class brisco {
    *   if ($idx == -1 && ret == FALSE)  =>  no space left
    *   if (ret == TRUE)                 =>  SUCCESS
    */
-  function &add_user(&$sess, &$idx, $name)
+  function &add_user(&$sess, &$idx, $name, $ip)
   {
     $idx = -1;
     $idfree = -1;
@@ -773,6 +854,7 @@ class brisco {
 
     if ($idx != -1 && $i == MAX_PLAYERS) {
       /* SUCCESS */
+      $curtime = time();
       if ($sess == "") {
 	$this->user[$idx]->sess = uniqid("");
 	$sess = $this->user[$idx]->sess;
@@ -782,11 +864,12 @@ class brisco {
 	$this->user[$idx]->sess = $sess;
       }
       $this->user[$idx]->name = $name_new;
-      $this->user[$idx]->stat = "room";
+      $this->user[$idx]->stat_set("room");
       $this->user[$idx]->subst = "standup";
-      $this->user[$idx]->laccwr = time();
+      $this->user[$idx]->lacc =   $curtime;
+      $this->user[$idx]->laccwr = $curtime;
       $this->user[$idx]->bantime = 0;
-      
+      $this->user[$idx]->ip = $ip;
       log_main("XXX", sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s]", $idx, $sess, $name_new));
       
       return ($this->user[$idx]);
@@ -811,7 +894,7 @@ class brisco {
 	
 	log_main("FROM STANDUP", "NAME: ".$user_cur->name." SENDED: ".$user_cur->comm[$user_cur->step % COMM_N]);
 	
-	$user_cur->step++;
+	$user_cur->step_inc();
       }
     }
   }
@@ -829,80 +912,98 @@ function log_main($sess, $log) {
   if (BRISK_DEBUG != TRUE)
     return;
 
-  $fp = fopen("/tmp/brisk_main.log", 'a');
-  fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
-  fclose($fp);
+  if (($fp = @fopen("/tmp/brisk_main.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+    fclose($fp);
+  }
 }
 
 function log_rd($sess, $log) {
   if (BRISK_DEBUG != TRUE)
     return;
 
-  $fp = fopen("/tmp/brisk_rd.log", 'a');
-  fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
-  fclose($fp);
+  if (($fp = @fopen("/tmp/brisk_rd.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+    fclose($fp);
+  }
 }
 
 function log_rd2($sess, $log) {
   if (BRISK_DEBUG != TRUE)
     return;
 
-  $fp = fopen("/tmp/brisk_rd2.log", 'a');
-  fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
-  fclose($fp);
+  if (($fp = @fopen("/tmp/brisk_rd2.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+    fclose($fp);
+  }
 }
 
 function log_send($sess, $log) {
   if (BRISK_DEBUG != TRUE)
     return;
 
-  $fp = fopen("/tmp/brisk_send.log", 'a');
-  fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
-  fclose($fp);
+  if (($fp = @fopen("/tmp/brisk_send.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+    fclose($fp);
+  }
 }
 
 function log_auth($sess, $log) {
   if (BRISK_DEBUG != TRUE)
     return;
 
-  $fp = fopen("/tmp/brisk_auth.log", 'a');
-  fwrite($fp, sprintf("SESS: [%d] [%s] [%s]\n", time(), $sess, $log));
-  fclose($fp);
+  if (($fp = @fopen("/tmp/brisk_auth.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("SESS: [%d] [%s] [%s]\n", time(), $sess, $log));
+    fclose($fp);
+  }
+}
+
+function log_lock($sess, $log) {
+  if (BRISK_DEBUG != TRUE)
+    return;
+
+  if (($fp = @fopen("/tmp/brisk_lock.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("SESS: [%d] [%s] [%s]\n", time(), $sess, $log));
+    fclose($fp);
+  }
 }
 
 function log_wr($sess, $log) {
   if (BRISK_DEBUG != TRUE)
     return;
 
-  $fp = fopen("/tmp/brisk_wr.log", 'a');
-  fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
-  fclose($fp);
+  if (($fp = @fopen("/tmp/brisk_wr.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+    fclose($fp);
+  }
 }
 
 function log_load($sess, $log) {
   if (BRISK_DEBUG != TRUE)
     return;
 
-  $fp = fopen("/tmp/brisk_load.log", 'a');
-  fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
-  fclose($fp);
+  if (($fp = @fopen("/tmp/brisk_load.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+    fclose($fp);
+  }
 }
 
 function log_legal($timecur, $sess, $name, $where, $mesg) 
 {
   GLOBAL $_SERVER;
 
-  $fp = fopen(LEGAL_PATH, 'a');
-  /* Unix time | session | nickname | IP | where was | mesg */
-  fwrite($fp, sprintf("%ld|%s|%s|%s|%s|%s|\n", $timecur, $sess, $name, $_SERVER['REMOTE_ADDR'], $where , $mesg));
-  fclose($fp);
+  if (($fp = @fopen(LEGAL_PATH, 'a')) != FALSE) {
+    /* Unix time | session | nickname | IP | where was | mesg */
+    fwrite($fp, sprintf("%ld|%s|%s|%s|%s|%s|\n", $timecur, $sess, $name, $_SERVER['REMOTE_ADDR'], $where , $mesg));
+    fclose($fp);
+  }
 }
 
 
 
 function init_data()
 {
-  $brisco = new brisco();
+  $brisco =& new brisco();
 
   return $brisco;
 }
@@ -920,13 +1021,38 @@ function lock_data()
     echo "SEM_GET FAILED";
     exit;
   }
-  if (sem_acquire($res)) 
+  if (sem_acquire($res)) {
+    log_lock($sess, "LOCK");
     return ($res);
+  }
   else
     return (false);
 }
 
 function unlock_data($res)
+{
+  log_lock($sess, "UNLOCK");
+  return (sem_release($res));
+}
+
+
+function lock_banlist()
+{
+  if (($tok = ftok(FTOK_PATH."/main", "L")) == -1) {
+    echo "FTOK FAILED";
+    exit;
+  }
+  if (($res = sem_get($tok)) == FALSE) {
+    echo "SEM_GET FAILED";
+    exit;
+  }
+  if (sem_acquire($res)) 
+    return ($res);
+  else
+    return (false);
+}
+
+function unlock_banlist($res)
 {
   return (sem_release($res));
 }
@@ -939,7 +1065,7 @@ function &load_data()
     exit;
   }
 
-  if ($shm = shm_attach($tok,100000 * TABLES_N)) {
+  if ($shm = shm_attach($tok, SHM_DIMS)) {
     if(($bri = @shm_get_var($shm, $tok)) == false) {
       log_main("XXX", "INIT MAIN DATA");
 
@@ -949,7 +1075,8 @@ function &load_data()
     
     shm_detach($shm);
 
-    return ($bri);
+    $ret = &$bri;
+    return ($ret);
   }
 
   return (NULL);
@@ -970,11 +1097,13 @@ function save_data(&$bri)
   do {
     $isacq = TRUE;
     
-    if (($shm = shm_attach($tok,100000 * TABLES_N)) == FALSE)
+    if (($shm = shm_attach($tok, SHM_DIMS)) == FALSE)
       break;
     
-    if (shm_put_var($shm, $tok, $bri) == FALSE)
+    if (shm_put_var($shm, $tok, $bri) == FALSE) {
+      echo "DANNO: ".strlen(serialize($bri));
       break;
+    }
     // log_main("XXX", "QUI CI ARRIVA [".$bri->user[0]->name."]");
     $ret = TRUE;
   } while (0);
@@ -1508,7 +1637,7 @@ function calculate_winner(&$table)
 
   for ($i = 0 ; $i < PLAYERS_N ; $i++) {
     $table->card[$ontid[$i]]->owner = $cur_win;
-    $table->card[$ontid[$i]]->stat =  "take";
+    $table->card[$ontid[$i]]->stat =  "take"; // Card stat
   }
   return ($cur_win);
 }