X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=2a2d9eb6ce32740184cab74a74641d463cd18603;hb=8fe1e432c4661ebf186026f920d778d37dbe0953;hp=02b91d6360f2932c55e194b1926f2bd2f94ce453;hpb=30aa38786951145d916b6a4e1db0b01946e02c6b;p=brisk.git diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index 02b91d6..2a2d9eb 100644 --- a/web/Obj/brisk.phh +++ b/web/Obj/brisk.phh @@ -35,7 +35,11 @@ define(MAX_PLAYERS, (20 + (PLAYERS_N * TABLES_N))); define(SHM_DIMS_MIN, (50000 + 10000 * TABLES_N + 15000 * MAX_PLAYERS)); define(SHM_DIMS_MAX, SHM_DIMS_MIN + 1048576); define(SHM_DIMS_DLT, 65536); - + +define(SHM_DIMS_U_MIN, 4096); +define(SHM_DIMS_U_MAX, 65536); +define(SHM_DIMS_U_DLT, 4096); + define(COMM_N, 18); define(COMM_GEN_N, 50); @@ -66,7 +70,7 @@ define(DBG_LOAD, 0x0100); define(DBG_AUTH, 0x0200); define(DBG_CRIT, 0x0400); define(DBG_LMOP, 0x0800); - +define(DBG_TRAC, 0x1000); // NOTE: BRISK DEBUG must be a numerical constant, not the result of operations on symbols define(BRISK_DEBUG, 0xffffffbf); @@ -120,21 +124,22 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi', 'tit_onauth'=>array( 'it' => '(solo aut.)', 'en' => '(only aut.)'), 'tit_onisol'=>array( 'it' => '(isolam.to)', - 'en' => '(isolation)') + 'en' => '(isolation)'), + 'db_failed' =>array('it' => '
Il collegamento al database è fallito.
Temporaneamente tutte le autenticazioni verranno sospese, accederai a Brisk come un utente normale.

Ci scusiamo per il disagio.', + 'en' => 'Connection to the database failed
All authentications are suspended temporarly, you login as normal user.
We are about the limitation') ); -$G_false = FALSE; $G_lng = langtolng($G_lang); $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 ); -$G_brisk_version = "2.5.0"; +$G_brisk_version = "3.5.3"; /* MLANG: ALL THE INFO STRINGS IN brisk.phh */ -$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': informazioni al tavolo sul chiamante, nuovo stato di supporter del sito.', +$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': terza versione di test per la nuova gestione dei dati volatili, rivista gestione del ticker.', 'Se vuoi iscriverti alla Mailing List, cliccala!' ), - 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: caller information on the table, new supporter status.', + 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: third test version for the new volatile data management, ticker management refactored.', 'If you want to subscribe our Mailing List, click it!' ) ); $G_room_help = array( 'it' => ' @@ -277,7 +282,6 @@ Copyright 2006-2009 Matteo Nasta
version '.$G_brisk_version.'

Copyright 2006-2009 Matteo Nastasi (aka mop)

'); - $escinp_from = array( "\"" ); $escinp_to = array( """ ); @@ -293,6 +297,11 @@ function eschtml($s) return htmlentities($s); } +function esclfhtml($s) +{ + return str_replace("\n", "
\n", htmlentities($s)); +} + function langtolng($lang) { @@ -354,6 +363,23 @@ function xcapemesg($s) } +class Vect { + function Vect($a) + { + $this->el = $a; + } + + function getbyid($idx) + { + return ($this->el[$idx]); + } + + function setbyid($idx, $v) + { + $this->el[$idx] = $v; + } +} + class Table { var $idx; var $player; @@ -374,19 +400,17 @@ class Table { { } - function &create($idx) + function create($idx) { - GLOBAL $G_false; - - if (($thiz =& new Table()) == FALSE) - return ($G_false); + if (($thiz = new Table()) == FALSE) + return (FALSE); $thiz->idx = $idx; $thiz->player = array(); $thiz->player_n = 0; $thiz->auth_only = FALSE; - $thiz->wag_own = NULL; + $thiz->wag_own = -1; $thiz->wag_com = ""; $thiz->wag_tout = 0; @@ -398,10 +422,8 @@ class Table { return ($thiz); } - function copy(&$from) + function copy($from) { - GLOBAL $G_false; - $this->idx = $from->idx; $this->player = array(); for ($i = 0 ; $i < $from->player_n ; $i++) @@ -422,24 +444,20 @@ class Table { $this->wakeup_time = $from->wakeup_time; } - function &myclone(&$from) + function myclone($from) { - GLOBAL $G_false; - - if (($thiz =& new Table()) == FALSE) - return ($G_false); + if (($thiz = new Table()) == FALSE) + return (FALSE); $this->copy($from); return ($thiz); } - function &spawn(&$from) + function spawn($from) { - GLOBAL $G_false; - - if (($thiz =& new Table()) == FALSE) - return ($G_false); + if (($thiz = new Table()) == FALSE) + return (FALSE); $thiz->idx = $from->idx; $thiz->player = array(); @@ -461,11 +479,11 @@ class Table { return ($thiz); } - function wag_set(&$user, $mesg) + function wag_set($user_idx, $mesg) { log_main("WAG_SET"); - $this->wag_own = &$user; + $this->wag_own = $user_idx; $this->wag_com = $mesg; $this->wag_tout = 0; } @@ -475,17 +493,17 @@ class Table { log_main("WAG_RESET"); unset($this->wag_own); - $this->wag_own = NULL; + $this->wag_own = -1; $this->wag_com = ""; $this->wag_tout = $timeout; } - function getPlayer($idx) + function player_get($idx) { return ($this->player[$idx]); } - function setPlayer($idx, $player) + function player_set($idx, $player) { $this->player[$idx] = $player; } @@ -498,7 +516,7 @@ class Table { return ($this->player_n - 1); } - function user_rem(&$room, &$user) + function user_rem($room, $user) { $tabpos = $user->table_pos; @@ -508,7 +526,7 @@ class Table { /* aggiorna l'array dei giocatori al tavolo. */ for ($i = $tabpos ; $i < $this->player_n-1 ; $i++) { $this->player[$i] = $this->player[$i+1]; - $user_cur = &$room->user[$this->player[$i]]; + $user_cur = $room->user[$this->player[$i]]; $user_cur->table_pos = $i; } $this->player_n--; @@ -524,7 +542,7 @@ class Table { // ($this->table[$i]->auth_only == FALSE ? TRUE : $user->flags & USER_FLAG_AUTH)); // function act_content($isstanding, $sitted, $table, $cur_table, $allowed) - function act_content(&$user) + function act_content($user) { $ret = ""; $isstanding = ($user->subst == 'standup'); @@ -568,10 +586,11 @@ class Table { define(USER_FLAG_AUTH, 0x02); define(USER_FLAG_MAP_AUTH, 0x0c); - define(USER_FLAG_LISTAUTH, 0x04); define(USER_FLAG_ISOLAUTH, 0x08); +define(USER_FLAG_DBFAILED, 0x10); + // user status define(USER_FLAG_S_NORM, 0x000); // done define(USER_FLAG_S_PAU, 0x100); // done @@ -589,11 +608,17 @@ define(USER_FLAG_S_MOP, 0xb00); // done define(USER_FLAG_S_ALL, 0xf00); // done /* type of user normal, supporter etc ... */ -define(USER_FLAG_TY_ALL, 0xf0000); // done -define(USER_FLAG_TY_NORM, 0x10000); // done -define(USER_FLAG_TY_SUPER, 0x20000); // done +define(USER_FLAG_TY_ALL, 0xff0000); // done +define(USER_FLAG_TY_NORM, 0x010000); // done +define(USER_FLAG_TY_SUPER, 0x020000); // done +// ... other usefull status ... +define(USER_FLAG_TY_SUSPEND, 0x400000); // done +define(USER_FLAG_TY_DISABLE, 0x800000); // done class User { + var $idx; // index in the users array when you are in game + var $idx_orig; // index in the users array when you aren't in game + var $code; // authentication code var $name; // name of the user var $sess; // session of the user var $ip; // ip of the user @@ -612,8 +637,8 @@ class User { // FIXME: the table_orig field must be removed after table field verify of index management (in spawned table // it is allways ZERO - var $table_orig; // id of the current table (if in table state) - var $table; // id of the current table (if in table state) + var $table; // id of the current table when you are in game + var $table_orig; // id of the current table when you aren't in game var $table_pos; // idx on the table var $table_token;// token that identify a game on a table var $flags; // Bitfield with: AUTHENTICATE: 0x02 @@ -624,51 +649,55 @@ class User { var $chat_cur; // Current chat line number var $chat_ban; // Time for ban chat var $chat_dlt; // Delta t for ban + var $shm_sz; + function User() { } - function &create($name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") { - GLOBAL $G_false; - - if (($thiz =& new User()) == FALSE) - return ($G_false); - - $thiz->name = $name; - $thiz->sess = $sess; - $thiz->ip = $ip; - $thiz->lacc = time(); - $thiz->laccwr = time(); - $thiz->bantime = 0; - $thiz->stat = $stat; - $thiz->subst = $subst; - $thiz->step = 1; - $thiz->trans_step = -1; - $thiz->comm = array(); - $thiz->asta_card = -2; - $thiz->asta_pnt = -1; - $thiz->handpt = -1; + function create($idx, $name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") { + if (($thiz = new User()) == FALSE) + return (FALSE); + + $thiz->idx = $idx; + $thiz->idx_orig = $idx; + $thiz->code = -1; + $thiz->name = $name; + $thiz->sess = $sess; + $thiz->ip = $ip; + $thiz->lacc = time(); + $thiz->laccwr = time(); + $thiz->bantime = 0; + $thiz->stat = $stat; + $thiz->subst = $subst; + $thiz->step = 1; + $thiz->trans_step = -1; + $thiz->comm = array(); + $thiz->asta_card = -2; + $thiz->asta_pnt = -1; + $thiz->handpt = -1; $thiz->exitislock = TRUE; - $thiz->flags = 0x00; + $thiz->flags = 0x00; - $thiz->chattime = array_fill(0, CHAT_N, 0); - $thiz->chat_cur = 0; - $thiz->chat_lst = ""; - $thiz->chat_ban = 0; - $thiz->chat_dlt = 0; + $thiz->chattime = array_fill(0, CHAT_N, 0); + $thiz->chat_cur = 0; + $thiz->chat_lst = ""; + $thiz->chat_ban = 0; + $thiz->chat_dlt = 0; $thiz->table_orig = $table; $thiz->table = $table; - $thiz->table_pos = -1; - $thiz->table_token = ""; - + $thiz->table_pos = -1; + $thiz->table_token= ""; + $thiz->shm_sz = SHM_DIMS_U_MIN; return ($thiz); } - function copy(&$from) + function copy($from) { - GLOBAL $G_false; - + $this->idx = $from->idx; + $this->idx_orig = $from->idx; + $this->code = $from->code; $this->name = $from->name; $this->sess = $from->sess; $this->ip = $from->ip; @@ -683,53 +712,54 @@ class User { $i_start = (1 > ($from->step - COMM_N) ? 1 : ($from->step - COMM_N)); for ($i = $i_start ; $i < $from->step ; $i++) { - $ii = $i % COMM_N; - $this->comm[$ii] = $from->comm[$ii]; + $ii = $i % COMM_N; + if (isset($from->comm[$ii])) { + $this->comm[$ii] = $from->comm[$ii]; + } } $this->asta_card = $from->asta_card; $this->asta_pnt = $from->asta_pnt; $this->handpt = $from->handpt; $this->exitislock = $from->exitislock; - $this->flags = $from->flags; + $this->flags = $from->flags; - $this->chattime = array(); + $this->chattime = array(); for ($i = 0 ; $i < CHAT_N ; $i++) $this->chattime[$i] = $from->chattime[$i]; - $this->chat_cur = $from->chat_cur; - $this->chat_lst = $from->chat_lst; - $this->chat_ban = $from->chat_ban; - $this->chat_dlt = $from->chat_dlt; + $this->chat_cur = $from->chat_cur; + $this->chat_lst = $from->chat_lst; + $this->chat_ban = $from->chat_ban; + $this->chat_dlt = $from->chat_dlt; $this->table_orig = $from->table_orig; $this->table = $from->table; $this->table_pos = $from->table_pos; $this->table_token = $from->table_token; $this->the_end = $from->the_end; - + $this->shm_sz = $from->shm_sz; return (TRUE); } - function &myclone(&$from) + function myclone($from) { - GLOBAL $G_false; - - if (($thiz =& new User()) == FALSE) - return ($G_false); + if (($thiz = new User()) == FALSE) + return (FALSE); $thiz->copy($from); return ($thiz); } - function &spawn(&$from, $table, $table_pos) + function spawn($from, $table, $table_pos) { - GLOBAL $G_false; - - if (($thiz =& new User()) == FALSE) - return ($G_false); + if (($thiz = new User()) == FALSE) + return (FALSE); + $thiz->idx = $from->idx; + $thiz->idx_orig = $from->idx; + $thiz->code = $from->code; $thiz->name = $from->name; $thiz->sess = $from->sess; $thiz->ip = $from->ip; @@ -769,9 +799,18 @@ class User { $thiz->table = 0; $thiz->table_pos = $table_pos; $thiz->table_token = $from->table_token; + $thiz->shm_sz = $from->shm_sz; return ($thiz); } + + function idx_get() { + return ($this->idx); + } + + function code_get() { + return ($this->code); + } function stat_set($stat) { log_main("sess: [".$this->sess. "] NEW STAT: [".$stat."]"); @@ -780,7 +819,7 @@ class User { /* if (validate_sess($this->sess)) { if (file_exists(PROXY_PATH) == FALSE) - mkdir(PROXY_PATH); + mkdir(PROXY_PATH, 0775, TRUE); $fp = fopen(PROXY_PATH."/".$this->sess.".stat", 'w'); fwrite($fp, sprintf("%s\n",$this->stat)); fclose($fp); @@ -788,39 +827,69 @@ class User { */ } - function step_set($step) { - $this->step = $step; - - do { - if (validate_sess($this->sess) == FALSE) - break; - if (file_exists(PROXY_PATH) == FALSE) - mkdir(PROXY_PATH); - if (($fp = @fopen(PROXY_PATH."/".$this->sess.".step", 'w')) == FALSE) - break; - fwrite($fp, pack("l",$this->step), 4); - fclose($fp); - + function step_set($step) + { + $this->step = $step & 0x7fffffff; + return (TRUE); - } while (0); - - return (FALSE); } function step_inc($delta = 1) { - $this->step += $delta; - - if (validate_sess($this->sess)) { - if (file_exists(PROXY_PATH) == FALSE) - mkdir(PROXY_PATH); - $fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w'); - fwrite($fp, pack("l",$this->step), 4); - fclose($fp); + $this->step += $delta; + /* modularization because unpack() not manage unsigned 32bit int correctly */ + $this->step &= 0x7fffffff; + + return TRUE; + } - return (TRUE); - } - - return (FALSE); + function save_step() + { + do { + if (validate_sess($this->sess) == FALSE) + break; + if (file_exists(PROXY_PATH) == FALSE) + mkdir(PROXY_PATH, 0775, TRUE); + if (($fp = @fopen(PROXY_PATH."/".$this->sess.".step", 'w')) == FALSE) + break; + fwrite($fp, pack("LL",$this->step, $this->idx)); + fclose($fp); + + log_main("step_set [".$this->sess. "] [".$this->step."]"); + + return (TRUE); + } while (0); + + return (FALSE); + } + + static function load_step($sess) + { + $fp = FALSE; + do { + if (validate_sess($sess) == FALSE) + break; + + if (file_exists(PROXY_PATH) == FALSE) + mkdir(PROXY_PATH, 0775, TRUE); + if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE) + break; + if (($s = fread($fp, 8)) == FALSE) + break; + if (mb_strlen($s, "ASCII") != 8) + break; + $arr = unpack('Ls/Li', $s); + fclose($fp); + + // log_rd2("A0: ".$arr[0]." A1: ".$arr[1]); + return ($arr); + } while (0); + + if ($fp != FALSE) + fclose($fp); + + log_rd2("STEP_GET [".$sess."]: return false "); + + return (FALSE); } function reset() { @@ -840,42 +909,109 @@ class User { $this->chat_dlt = 0; $this->the_end = FALSE; } -} // end class User - - - + static function load_data($id, $sess) + { + log_main("load_data: id [".$id."] sess [".($sess == FALSE ? "FALSE" : $sess)."] "); + + do { + if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) { + log_main("ftok failed"); + break; + } + + if (($shm_sz = sharedmem_sz($tok)) == -1) { + log_main("shmop_open failed"); + } + + if ($shm_sz == -1) + $shm_sz = SHM_DIMS_U_MIN; + + if ($shm = shm_attach($tok, $shm_sz)) { + $user = @shm_get_var($shm, $tok); + + if ($sess != FALSE && $user->sess != $sess) { + break; + } + log_only("user == ".($user == FALSE ? "FALSE" : "TRUE")." user === ".($user === FALSE ? "FALSE" : "TRUE")." user isset ".(isset($user) ? "TRUE" : "FALSE")); + + if ($user == FALSE) { + log_only("INIT MAIN DATA"); + + // SHSPLIT FIXME: init_data for User class ?? + $user = User::create($id, "", ""); + if (@shm_put_var($shm, $tok, $user) == FALSE) { + log_only("PUT_VAR FALLITA ".strlen(serialize($user))); + log_only(serialize($user)); + } + } + else { + if ($sess != FALSE) { + /* + * NOTE: this part is for check only, theoretically + * user->step anch proxy_step are set allways at the same value + */ + $old_step = $user->step; + $arr = User::load_step($sess); + $user->step = $arr['s']; + if ($old_step != $user->step) { + log_crit("steps are diffetents User->step ".$user->step." Old_step: ".$old_step); + } + } + } + $user->shm_sz = $shm_sz; + + shm_detach($shm); + } + + // + // SHSPLIT: load users from the shared memory + // + return ($user); + } while (0); + + return (FALSE); + } + + static function save_data($user, $id) + { + GLOBAL $sess; + + $shm = FALSE; + + if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) { + return (FALSE); + } + while ($user->shm_sz < SHM_DIMS_U_MAX) { + if (($shm = shm_attach($tok, $user->shm_sz)) == FALSE) + break; + + // log_only("PUT_VAR DI ".strlen(serialize($user))); + if (shm_put_var($shm, $tok, $user) != FALSE) { + shm_detach($shm); + if ($user->sess != "") + $user->save_step(); + log_main("User[".$id."] saved."); + return (TRUE); + } + if (shm_remove($shm) === FALSE) { + log_only("REMOVE FALLITA"); + break; + } + shm_detach($shm); + $user->shm_sz += SHM_DIMS_U_DLT; + } + + if ($shm) + shm_detach($shm); + + return (FALSE); + } -function step_get($sess) { - $fp = FALSE; - do { - if (validate_sess($sess) == FALSE) - break; - - if (file_exists(PROXY_PATH) == FALSE) - mkdir(PROXY_PATH); - if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE) - break; - if (($s = fread($fp, 4)) == FALSE) - break; - if (strlen($s) != 4) - break; - $arr = unpack('l', $s); - fclose($fp); - - // log_rd2("A0: ".$arr[0]." A1: ".$arr[1]); - return ($arr[1]); - } while (0); - - if ($fp != FALSE) - fclose($fp); - - log_rd2("STEP_GET: return false "); +} // end class User - return (FALSE); -} function step_unproxy($sess) { log_rd2("UNPROXY: ".PROXY_PATH."/".$sess.".step"); @@ -886,11 +1022,13 @@ function step_unproxy($sess) { class Room { + static $delta_t; + var $user; var $table; var $comm; // commands for many people var $step; // current step of the comm array - var $garbage_timeout; + // externalized var $garbage_timeout; var $shm_sz; function Room () { @@ -898,11 +1036,11 @@ class Room { $this->table = array(); for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - $this->user[$i] =& User::create("", ""); + $this->user[$i] = User::create($i, "", ""); } for ($i = 0 ; $i < TABLES_N ; $i++) { - $this->table[$i] =& Table::create($i); + $this->table[$i] = Table::create($i); /* OLD METHOD if ($i < 12) { $row = ( (((int)($i / 4)) % 2) == 0 ); @@ -918,12 +1056,14 @@ class Room { else $this->table[$i]->auth_only = FALSE; } - $this->garbage_timeout = 0; + // externalized $this->garbage_timeout = 0; + Room::garbage_time_expire_set(0); + $this->shm_sz = SHM_DIMS_MIN; } function garbage_manager($force) { - GLOBAL $G_lang, $mlang_brisk; + GLOBAL $G_lang, $mlang_brisk, $G_base; $ismod = FALSE; @@ -931,24 +1071,26 @@ class Room { /* Garbage collector degli utenti in timeout */ $curtime = time(); - if ($force || $this->garbage_timeout < $curtime) { + + // externalized if ($force || $this->garbage_timeout < $curtime) { + if ($force || Room::garbage_time_is_expired($curtime)) { // FIXME BRISK4: include for each kind of table - require_once("briskin5/Obj/briskin5.phh"); + require_once("${G_base}briskin5/Obj/briskin5.phh"); // Before all align times with table timeout for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) { - $table_cur =& $this->table[$table_idx]; + $table_cur = $this->table[$table_idx]; // if the table is complete and exists its shared mem we get the info about users lacc if ($table_cur->player_n == PLAYERS_N) { log_main("PLAYERS == N TABLE ".$table_idx); - if (($sem = Briskin5::lock_data($table_idx)) != FALSE) { + if (($sem = Bin5::lock_data($table_idx)) != FALSE) { log_main("bin5 lock data success"); $no_recovery = FALSE; - if (($bri = &Briskin5::load_data($table_idx)) != FALSE) { + if (($bri = Bin5::load_data($table_idx)) != FALSE) { if ($table_cur->table_token != $bri->table_token) { log_main("ERROR: not matching table_token. Room: ".$table_cur->table_token." Table: ".$bri->table_token); log_main("ERROR: not matching table_start. Room: ".$table_cur->table_start." Table: ".$bri->table_start); @@ -964,11 +1106,11 @@ class Room { log_main("garbage_manager: bri loaded successfully."); $bri->garbage_manager(TRUE); - $bri_table = &$bri->table[0]; + $bri_table = $bri->table[0]; // is the end of the table if ($bri->the_end == TRUE) { - /* + /* * DESTROY OF FINISHED TABLE && MOVE PLAYER TO ROOM AGAIN */ log_main("garbage_manager: INSIDE THE END."); @@ -980,8 +1122,8 @@ class Room { for ($i = 0 ; $i < $bri_table->player_n ; $i++) { // stat must be "table" by definition - $user_cur =& $this->user[$table_cur->player[$i]]; - $bri_user =& $bri->user[$i]; + $user_cur = $this->user[$table_cur->player[$i]]; + $bri_user = $bri->user[$i]; $user_cur->subst = $bri_user->subst; $user_cur->step = $bri_user->step; @@ -992,10 +1134,10 @@ class Room { log_legal($curtime, $user_cur, "STAT:DESTROY_GAME", $plist); - $this->room_join_wakeup(&$user_cur, FALSE, 0); + $this->room_join_wakeup($user_cur, FALSE, 0); $table_cur->table_token = ""; $table_cur->wakeup_time = $curtime + WAKEUP_TIME; - Briskin5::destroy_data($table_idx); + Bin5::destroy_data($table_idx); } else { log_main("gm:: save_data"); @@ -1004,14 +1146,14 @@ class Room { $this->user[$table_cur->player[$i]]->lacc = $bri->user[$i]->lacc; } - Briskin5::save_data(&$bri); + Bin5::save_data($bri); } - } // else if (($bri = &Briskin5::load_data($table_idx)) != FALSE) { + } // else if (($bri = Bin5::load_data($table_idx)) != FALSE) { else if ($no_recovery == FALSE) { log_crit("ERROR: table ".$table_idx." unrecoverable join"); for ($i = 0 ; $i < $table_cur->player_n ; $i++) { - $user_cur = &$this->user[$table_cur->player[$i]]; + $user_cur = $this->user[$table_cur->player[$i]]; $user_cur->subst = "shutdowner"; $user_cur->step_inc(); @@ -1030,11 +1172,11 @@ class Room { } log_legal($curtime, $user_cur, "STAT:DESTROY_GAME(RECOVERY)", $plist); - $this->room_join_wakeup(&$user_cur, TRUE, -2); + $this->room_join_wakeup($user_cur, TRUE, -2); $table_cur->table_token = ""; } - Briskin5::unlock_data($sem); + Bin5::unlock_data($sem); } // bri::lock_data } // if ($table_cur->player_n == PLAYERS_N) { } // for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) { @@ -1042,7 +1184,7 @@ class Room { log_rd2("out new loop."); for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - $user_cur = &$this->user[$i]; + $user_cur = $this->user[$i]; log_rd2("User: ".$user_cur->name." stat: ".$user_cur->stat." subst: ".$user_cur->subst); @@ -1060,9 +1202,9 @@ class Room { log_rd2("AUTO LOGOUT."); if ($user_cur->subst == 'sitdown' || $user_cur->stat == 'table') - $this->room_wakeup(&$user_cur); + $this->room_wakeup($user_cur); else if ($user_cur->subst == 'standup') - $this->room_outstandup(&$user_cur); + $this->room_outstandup($user_cur); else log_rd2("LOGOUT FROM WHAT ???"); } @@ -1070,7 +1212,7 @@ class Room { if ($user_cur->laccwr + EXPIRE_TIME_SMAMMA < $curtime) { // lo rimettiamo in piedi if ($user_cur->stat == 'room' && $user_cur->subst == 'sitdown') { - $this->room_wakeup(&$user_cur); + $this->room_wakeup($user_cur); $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; "; /* MLANG:
Sei stato inattivo per ".(EXPIRE_TIME_SMAMMA/60.0)." minuti.

Quindi ritorni tra i Giocatori in piedi.", "torna ai tavoli" */ $user_cur->comm[$user_cur->step % COMM_N] .= show_notify($mlang_brisk['tabtout_a'][$G_lang].(EXPIRE_TIME_SMAMMA/60.0).$mlang_brisk['tabtout_b'][$G_lang], 0, $mlang_brisk['btn_backstand'][$G_lang], 400, 100); @@ -1080,14 +1222,15 @@ class Room { } log_rd2("GARBAGE UPDATED!"); - $this->garbage_timeout = time() + GARBAGE_TIMEOUT; + // externalized $this->garbage_timeout = time() + GARBAGE_TIMEOUT; + Room::garbage_time_expire_set($curtime + GARBAGE_TIMEOUT); $ismod = TRUE; } return ($ismod); } - function show_room($user_step, &$user) + function show_room($user_step, $user) { GLOBAL $G_lang, $mlang_brisk; log_main("show_room: username: ".$user->name); @@ -1112,6 +1255,11 @@ class Room { $ret .= sprintf('stat = "%s";', $user->stat); $ret .= root_wellcome($user); + if ($user->flags & USER_FLAG_DBFAILED) { + $ret .= "gst.st = ".($user->step+1)."; "; + $ret .= show_notify($mlang_brisk['db_failed'][$G_lang], 0, $mlang_brisk['btn_close'][$G_lang], 400, 140); + } + $ret .= sprintf('subst = "%s";', $user->subst); $itin = ($user->flags & USER_FLAG_AUTH ? "" : ""); $itou = ($user->flags & USER_FLAG_AUTH ? "" : ""); @@ -1122,8 +1270,8 @@ class Room { // $ret .= table_act_content(($user->subst == 'standup'), $this->table[$i]->player_n, $i, $user->table, // ($this->table[$i]->auth_only == FALSE ? TRUE : $user->flags & USER_FLAG_AUTH)); $ret .= $this->table[$i]->act_content($user); - if ($this->table[$i]->wag_own != NULL) - $ret .= sprintf('tra.add(%d, "%s: %s"); ', $i, $this->table[$i]->wag_own->name, $this->table[$i]->wag_com); + if ($this->table[$i]->wag_own != -1) + $ret .= sprintf('tra.add(%d, "%s: %s"); ', $i, $this->user[$this->table[$i]->wag_own]->name, $this->table[$i]->wag_com); else $ret .= sprintf('tra.rem(%d); ', $i); } @@ -1133,10 +1281,10 @@ class Room { } - function room_wakeup(&$user) + function room_wakeup($user) { $table_idx = $user->table; - $table = &$this->table[$table_idx]; + $table = $this->table[$table_idx]; log_main("WAKEUP: begin function table:".$table_idx." stat: ".$user->stat." subst: ".$user->subst); @@ -1147,10 +1295,10 @@ class Room { log_main("WAKEUP: from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n); for ($i = 0 ; $i < $table->player_n ; $i++) { - $user_cur = &$this->user[$table->player[$i]]; + $user_cur = $this->user[$table->player[$i]]; log_main("PREIMPOST: INLOOP name: ".$user_cur->name); - if ($user_cur != $user) { + if ($user->idx_get() != $table->player[$i]) { $user_cur->stat_set("room"); $user_cur->subst = "sitdown"; $user_cur->laccwr = $curtime; @@ -1169,26 +1317,25 @@ class Room { $user->laccwr = $curtime; } - $remove_wagon = false; - if($table->wag_own == $user) { - $remove_wagon = true; + $remove_wagon = FALSE; + if($table->wag_own == $user->idx_get()) { $table->wag_reset($curtime); - + $remove_wagon = TRUE; } /* aggiorna l'array dei giocatori al tavolo. */ - $table->user_rem(&$this, &$user); + $table->user_rem($this, $user); for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - $user_cur = &$this->user[$i]; + $user_cur = $this->user[$i]; if ($user_cur->sess == '' || $user_cur->stat != 'room') continue; // log_main("VALORI: name: ".$user_cur->name."from_table: ".$from_table." tab: ".$user_cur->table." taix: ".$table_idx." ucur: ".$user_cur." us: ".$user); $ret = "gst.st = ".($user_cur->step+1)."; ".($remove_wagon ? sprintf("tra.rem(%d);",$table_idx) : ""); - if ($from_table && ($user_cur->table == $table_idx || $user_cur == $user)) { + if ($from_table && ($user_cur->table == $table_idx || $user->idx_get() == $i)) { $ret .= 'gst.st_loc++; the_end=true; window.onunload = null; window.onbeforeunload = null; document.location.assign("index.php");|'; // $ret .= 'gst.st_loc++; document.location.assign("index.php");|'; log_main("DOCUMENT.index.php: from table"); @@ -1202,7 +1349,7 @@ class Room { // $ret .= table_act_content(FALSE, 0, $table_idx, $user->table, FALSE); $ret .= $table->act_content($user); - if ($user_cur == $user) { + if ($user->idx_get() == $i) { // set the new status $ret .= 'subst = "standup"; tra.show(); '; // clean the action buttons in other tables @@ -1226,10 +1373,10 @@ class Room { } } - function room_join_wakeup(&$user, $update_lacc = FALSE, $trans_delta) + function room_join_wakeup($user, $update_lacc = FALSE, $trans_delta) { $table_idx = $user->table; - $table = &$this->table[$table_idx]; + $table = $this->table[$table_idx]; log_main("JOIN_WAKEUP: begin function table:".$table_idx." stat: ".$user->stat." subst: ".$user->subst); @@ -1241,7 +1388,7 @@ class Room { log_main("JOIN WAKEUP: from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n); for ($i = 0 ; $i < $table->player_n ; $i++) { - $user_cur = &$this->user[$table->player[$i]]; + $user_cur = $this->user[$table->player[$i]]; log_main("PREIMPOST INLOOP name: ".$user_cur->name); if ($user_cur->sess != "") { if ($update_lacc == TRUE) { @@ -1256,26 +1403,26 @@ class Room { $user_cur->stat_set("room"); $user_cur->subst = "standup"; $user_cur->table = -1; - $user_wup[$user_wup_n++] = &$user_cur; + $user_wup[$user_wup_n++] = $user_cur; - $remove_wagon = false; - if($table->wag_own == $user_cur) { - $remove_wagon = true; + $remove_wagon = FALSE; + if($table->wag_own == $table->player[$i]) { + $remove_wagon = TRUE; $table->wag_reset($curtime); } } - $user_tab[$user_tab_n++] = &$user_cur; + $user_tab[$user_tab_n++] = $table->player[$i]; } } for ($wup_idx = 0 ; $wup_idx < $user_wup_n ; $wup_idx++) - $table->user_rem(&$this, &$user_wup[$wup_idx]); + $table->user_rem($this, $user_wup[$wup_idx]); /* aggiorna l'array dei giocatori al tavolo. */ for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { log_main("START LOOP"); - $user_cur = &$this->user[$i]; + $user_cur = $this->user[$i]; if ($user_cur->sess == '' || $user_cur->stat != 'room') { log_main("name: ".$user_cur->name."skip subst: ".$user_cur->subst); continue; @@ -1297,8 +1444,8 @@ class Room { for ($tab_idx = 0 ; $tab_idx < $user_tab_n ; $tab_idx++) - if ($user_cur == $user_tab[$tab_idx]) - break; + if ($user_tab[$tab_idx] == $i) + break; // for users that wakeup the room will be reconstructed by index_rd.php if ($tab_idx < $user_tab_n) { @@ -1311,7 +1458,7 @@ class Room { $user_cur->trans_step = $user_cur->step + 1 + $trans_delta; $user_cur->comm[$user_cur->step % COMM_N] = ""; $user_cur->step_inc(); - $user_cur->comm[$user_cur->step % COMM_N] = $this->show_room(($user_cur->step + 1), &$user_cur); + $user_cur->comm[$user_cur->step % COMM_N] = $this->show_room(($user_cur->step + 1), $user_cur); $user_cur->step_inc(); log_main("POST show_room username: ".$user_cur->name." STEP: ".$user_cur->step); @@ -1332,23 +1479,23 @@ class Room { } } - function room_outstandup(&$user) + function room_outstandup($user) { - $this->room_sitdown(&$user, -1); + $this->room_sitdown($user, -1); } - function table_update(&$user) + function table_update($user) { log_main("table_update: pre - USER: ".$user->name); $table_idx = $user->table; if ($table_idx > -1) - $table = &$this->table[$table_idx]; + $table = $this->table[$table_idx]; for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $ret = ""; - $user_cur = &$this->user[$i]; + $user_cur = $this->user[$i]; if ($user_cur->sess == '' || $user_cur->stat != 'room') continue; @@ -1356,7 +1503,7 @@ class Room { if ($table_idx > -1) $ret .= $this->table_content($user_cur, $table_idx); - if ($user_cur == $user) { + if ($user->idx_get() == $i) { $itin = ($user->flags & USER_FLAG_AUTH ? "" : ""); $itou = ($user->flags & USER_FLAG_AUTH ? "" : ""); $ret .= sprintf('$("myname").innerHTML = "%s%s%s: ";', $itin, xcape($user->name), $itou); @@ -1368,31 +1515,30 @@ class Room { log_main("table_update: post"); } - function room_sitdown(&$user, $table_idx) + function room_sitdown($user, $table_idx) { log_main("room_sitdown ".($user == FALSE ? "USER: FALSE" : "USER: ".$user->name)); $train_app = ""; if ($table_idx > -1 && $table_idx < TABLES_N) { - $table = &$this->table[$table_idx]; + $table = $this->table[$table_idx]; // wagon shutdown - if ($table->wag_own != NULL && $table->player_n == PLAYERS_N) { + if ($table->wag_own != -1 && $table->player_n == PLAYERS_N) { for ($i = 0 ; $i < TABLES_N ; $i++) { - $user_cur =& $this->user[$table->player[$i]]; - if ($user_cur == $table->wag_own) { - $train_app = sprintf("tra.rem(%d); ", $table_idx); - $table->wag_reset(time()); - break; - } + if ($table->wag_own == $table->player[$i]) { + $train_app = sprintf("tra.rem(%d); ", $table_idx); + $table->wag_reset(time()); + break; + } } } } for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $ret = ""; - $user_cur = &$this->user[$i]; + $user_cur = $this->user[$i]; if ($user_cur->sess == '' || $user_cur->stat != 'room') continue; @@ -1401,7 +1547,7 @@ class Room { $ret .= $this->table_content($user_cur, $table_idx); $ret .= $this->standup_content($user_cur); - if ($user_cur == $user) { + if ($user->idx_get() == $i) { $ret .= 'subst = "sitdown"; tra.hide(); '; // clean the action buttons in other tables for ($e = 0 ; $e < TABLES_N ; $e++) { @@ -1421,15 +1567,16 @@ class Room { } } - function chatt_send(&$user, $mesg) + function chatt_send($user, $mesg) { - GLOBAL $G_alarm_passwd, $mlang_brisk, $G_lang; + GLOBAL $G_base, $G_alarm_passwd, $mlang_brisk, $G_lang; $only_you = FALSE; // common settings $msg = substr($mesg, 6, 128); $curtime = time(); $dt = date("H:i ", $curtime); + $target = ""; // // Compute actions @@ -1454,9 +1601,9 @@ class Room { break; } - $table = &$this->table[$user->table]; + $table = $this->table[$user->table]; - if ($table->wag_own != NULL) { + if ($table->wag_own != -1) { // MLANG
Il messaggio di segnalazione del tavolo è già attivato.

$msg = $mlang_brisk['tickjust'][$G_lang]; $to_user = show_notify($msg, 0, "chiudi", 400, 100); @@ -1476,7 +1623,7 @@ class Room { $msg = substr($msg, 5); - $table->wag_set($user, $msg); + $table->wag_set($user->idx_get(), $msg); $to_user = sprintf('tra.add(%d, "%s");', $user->table, xcape(sprintf("%s: %s", $user->name, $msg))); $to_room = $to_user; /* for old isolation management $is_ticker = TRUE; */ @@ -1577,7 +1724,7 @@ class Room { $msg = "COMMAND ".$msg; for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - $user_cur = &$this->user[$i]; + $user_cur = $this->user[$i]; if ($user_cur->sess == '') continue; @@ -1612,12 +1759,14 @@ class Room { $user->name = $name_new; // OK - nick changed /* se nome gia' in uso, segnala cosa potrebbe capitare */ if (($user->flags & USER_FLAG_AUTH) == 0) { - $userdb = new LoginDB(); - /* MLANG: "Il nickname \'%s\' è già registrato, se il suo proprietario si autentificherà verrai rinominato d\'ufficio come ghostN." */ - if ($userdb->login_exists($name_new)) { - $prestr = sprintf($mlang_brisk['nickjust'][$G_lang], xcape($name_new)); - $to_user .= sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $prestr); - } + if (($bdb = BriskDB::create()) != FALSE) { + $bdb->users_load(); + /* MLANG: "Il nickname \'%s\' è già registrato, se il suo proprietario si autentificherà verrai rinominato d\'ufficio come ghostN." */ + if ($bdb->login_exists($name_new)) { + $prestr = sprintf($mlang_brisk['nickjust'][$G_lang], xcape($name_new)); + $to_user .= sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $prestr); + } + } } log_main("chatt_send start set"); @@ -1737,11 +1886,10 @@ class Room { if ($to_room != FALSE) { for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - $user_cur = &$this->user[$i]; + $user_cur = $this->user[$i]; if ($target != "" && $user_cur->name != $target) continue; - // if ($user_cur->sess == '' || $user_cur->stat != 'room') - if ($user_cur->sess == '' || $user_cur->stat == 'table' || $user_cur == $user) + if ($user_cur->sess == '' || $user_cur->stat == 'table' || $user->idx_get() == $i) continue; if ($is_normchat == TRUE) { @@ -1768,20 +1916,20 @@ class Room { if ($to_tabl) { // FIXME BRISK4: include for each kind of table - require_once("briskin5/Obj/briskin5.phh"); + require_once("${G_base}briskin5/Obj/briskin5.phh"); // Before all align times with table timeout for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) { - $table_cur =& $this->table[$table_idx]; + $table_cur = $this->table[$table_idx]; // if the table is complete and exists its shared mem we get the info about users lacc if ($table_cur->player_n == PLAYERS_N) { log_main("PLAYERS == N TABLE ".$table_idx); - if (($sem = Briskin5::lock_data($table_idx)) != FALSE) { + if (($sem = Bin5::lock_data($table_idx)) != FALSE) { log_main("bin5 lock data success"); $no_recovery = FALSE; - if (($bri = &Briskin5::load_data($table_idx)) != FALSE) { + if (($bri = Bin5::load_data($table_idx)) != FALSE) { if ($table_cur->table_token != $bri->table_token) { log_main("ERROR: not matching table_token. Room: ".$table_cur->table_token." Table: ".$bri->table_token); $bri = FALSE; @@ -1789,10 +1937,10 @@ class Room { } if ($bri != FALSE) { - $bri_table = &$bri->table[0]; + $bri_table = $bri->table[0]; for ($i = 0 ; $i < $bri_table->player_n ; $i++) { // stat must be "table" by definition - $bri_user =& $bri->user[$i]; + $bri_user = $bri->user[$i]; if ($target != "" && $bri_user->name != $target) continue; @@ -1801,9 +1949,9 @@ class Room { $bri_user->comm[$bri_user->step % COMM_N] .= $to_tabl; $bri_user->step_inc(); } - Briskin5::save_data(&$bri); + Bin5::save_data($bri); } - Briskin5::unlock_data($sem); + Bin5::unlock_data($sem); } // bri::lock_data } // if ($table_cur->player_n == PLAYERS_N) { } // for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) { @@ -1811,11 +1959,11 @@ class Room { if ($update_room) { if ($user->stat == 'room' && $user->subst == 'standup') { - $this->standup_update(&$user); + $this->standup_update($user); } else if ($user->stat == 'room' && $user->subst == 'sitdown') { log_main("chatt_send pre table update"); - $this->table_update(&$user); + $this->table_update($user); log_main("chatt_send post table update"); } } // if ($update_room ... @@ -1823,16 +1971,16 @@ class Room { return; } // function chatt_send( ... - function &get_user($sess, &$idx) + function get_user($sess, &$idx) { - GLOBAL $PHP_SELF, $G_false; + GLOBAL $PHP_SELF; if (validate_sess($sess)) { for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { if (strcmp($sess, $this->user[$i]->sess) == 0) { // find it $idx = $i; - $ret = &$this->user[$i]; + $ret = $this->user[$i]; return ($ret); } } @@ -1844,13 +1992,11 @@ class Room { log_main(sprintf("get_user: Wrong strlen [%s]",$sess)); } - return ($G_false); + return (FALSE); } - - /* - * function &add_user(&$room, &$sess, &$idx, $name, $pass, $ip) + * function add_user(&$room, &$sess, &$idx, $name, $pass, $ip) * * RETURN VALUE: * if ($idx > -1 && ret == FALSE) => duplicated nick @@ -1858,14 +2004,12 @@ class Room { * if ($idx == -3 && ret == FALSE) => wrong password * if ($idx == -1 && ret == FALSE) => no space left * if ($idx == 0 && ret == user) => SUCCESS - * if ($idx == -$idx && ret == user) => SUCCESS (but the login exists in the auth db + * if ($idx == -$idx && ret == user) => SUCCESS (but the login exists in the auth db) */ - - - function &add_user(&$sess, &$idx, $name, $pass, $ip) + function add_user(&$sess, &$idx, $name, $pass, $ip) { - GLOBAL $G_false, $CO_list; + GLOBAL $G_base, $CO_list; $idx = 0; @@ -1876,10 +2020,11 @@ class Room { $ghost_auth = FALSE; $idx = -1; $idfree = -1; - + $code = FALSE; + if (($name_new = validate_name($name)) == FALSE) { $idx = -2; - return ($G_false); + return (FALSE); } log_auth("XXX", sprintf("ARRIVA: [%s] pass:[%s]", $sess, ($pass == FALSE ? "FALSE" : $pass))); @@ -1888,22 +2033,29 @@ class Room { /* if pass != FALSE verify the login with pass */ log_auth("XXX", "auth1"); - $userdb = new LoginDB(); - if ($pass != FALSE) { - log_auth("XXX", "auth2"); - $authenticate = $userdb->login_verify($name_new, $pass); - log_auth("XXX", "authenticate: ".($authenticate != FALSE ? "TRUE" : "FALSE")); - - if ($authenticate != FALSE) { - $user_type = $authenticate->typeget(); - } - else { - $idx = -3; - return ($G_false); - } + + if (($bdb = BriskDB::create()) != FALSE) { + $bdb->users_load(); + if ($pass != FALSE) { // TODO: here add a method to $bdb to check if the db is available. + log_auth("XXX", "auth2"); + $authenticate = $bdb->login_verify($name_new, $pass, $code); + log_auth("XXX", "authenticate: ".($authenticate != FALSE ? "TRUE" : "FALSE")); + + if ($authenticate != FALSE) { + $user_type = $authenticate->type_get(); + } + else { + $idx = -3; + return (FALSE); + } + } + else { + $login_exists = $bdb->login_exists($name_new); + } } else { - $login_exists = $userdb->login_exists($name_new); + // if db is down, send a warning and verify only current users + // no actions at this moment } for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { /* free user ? */ @@ -1911,7 +2063,7 @@ class Room { if ($idx == -1) $idx = $i; } - if ($idfree == -1 && strcmp("", $this->user[$i]->sess) == 0) { + if ($idfree == -1 && strcmp($this->user[$i]->sess, "") == 0) { $idfree = $i; continue; // NOTE: CHECK IT !! } @@ -1931,10 +2083,12 @@ class Room { log_auth("XXX", sprintf("TROVATO A QUESTO PUNTO [%d] sess [%s] name [%s]", $idx, $sess, $name_new)); + /* there is another user logged with your account and you and him have authenticated => che new user + get the session of the old user */ if ($ghost > -1 && $ghost_auth && ($authenticate != FALSE)) { /* swap session */ - $ghost_user =& $this->user[$ghost]; + $ghost_user = $this->user[$ghost]; $curtime = time(); $ghost_user->step_inc(); if ($sess == "") { @@ -1949,16 +2103,16 @@ class Room { $table_idx = $ghost_user->table; if ($ghost_user->stat == "table" && $this->table[$table_idx]->player_n == PLAYERS_N) { // FIXME BRISK4: include for each kind of table - require_once("briskin5/Obj/briskin5.phh"); - if (($brisem = Briskin5::lock_data($table_idx)) != FALSE) { - if (($bri = &Briskin5::load_data($table_idx)) != FALSE) { + require_once("${G_base}briskin5/Obj/briskin5.phh"); + if (($brisem = Bin5::lock_data($table_idx)) != FALSE) { + if (($bri = Bin5::load_data($table_idx)) != FALSE) { if ($bri->the_end != TRUE) { $bri->user[$ghost_user->table_pos]->step_inc(); $bri->user[$ghost_user->table_pos]->sess = $sess; - Briskin5::save_data(&$bri); + Bin5::save_data($bri); } } - Briskin5::unlock_data($brisem); + Bin5::unlock_data($brisem); } } @@ -1985,12 +2139,14 @@ class Room { $this->user[$idx]->bantime = 0; $this->user[$idx]->ip = $ip; - $this->user[$idx]->flags = ($authenticate != FALSE ? USER_FLAG_AUTH : 0x00) | $user_type; - + $this->user[$idx]->flags = $user_type; + $this->user[$idx]->flags |= ($authenticate != FALSE ? USER_FLAG_AUTH : 0x00); + $this->user[$idx]->flags |= ( ($pass != FALSE && $bdb == FALSE) ? USER_FLAG_DBFAILED : 0x00); log_auth("XXX", sprintf("FLAGS: [%x]", $this->user[$idx]->flags)); if ($authenticate != FALSE) { + $this->user[$idx]->code = $authenticate->code_get(); $this->user[$idx]->flags |= USER_FLAG_LISTAUTH; if (isset($CO_list)) { @@ -2010,7 +2166,7 @@ class Room { if ($ghost > -1) { log_main("ghost: rename!"); - $ghost_user =& $this->user[$ghost]; + $ghost_user = $this->user[$ghost]; if ($ghost_auth == FALSE) { for ($sfx = 1 ; $sfx <= MAX_PLAYERS ; $sfx++) { @@ -2031,11 +2187,11 @@ class Room { $ghost_user->name = $ghostname; if ($ghost_user->stat == 'room' && $ghost_user->subst == 'standup') { - $this->standup_update(&$ghost_user); + $this->standup_update($ghost_user); } else { log_main("chatt_send pre table update"); - $this->table_update(&$ghost_user); + $this->table_update($ghost_user); log_main("chatt_send post table update"); } } // if ($ghost_auth == FALSE @@ -2050,17 +2206,19 @@ class Room { $real_idx = $idx; if ($login_exists) $idx = -($idx + 1); - log_main(sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s] count [%d] [%s]", $idx, $sess, $name_new, count($this->user),$this->user[$real_idx]->name)); - return ($this->user[$real_idx]); + log_main(sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s] count [%d] name [%s] code [%s]", $idx, $sess, $name_new, count($this->user),$this->user[$real_idx]->name, $this->user[$real_idx]->code)); + + $ret = $this->user[$real_idx]; + return ($ret); } - return ($G_false); + return (FALSE); } - function standup_update(&$user) + function standup_update($user) { for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - $user_cur = &$this->user[$i]; + $user_cur = $this->user[$i]; if ($user_cur->sess == '') continue; @@ -2068,7 +2226,7 @@ class Room { if ($user_cur->stat == 'room') { $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ".$this->standup_content($user_cur); - if ($user_cur == $user) { + if ($user->idx_get() == $i) { $itin = ($user->flags & USER_FLAG_AUTH ? "" : ""); $itou = ($user->flags & USER_FLAG_AUTH ? "" : ""); @@ -2083,22 +2241,21 @@ class Room { } // Static functions - function &init_data() + static function create() { - $room =& new Room(); + $room = new Room(); return $room; } - - function &load_data() + + function load_data() { - GLOBAL $G_false, $sess; - $doexit = FALSE; + GLOBAL $sess; + do { if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) { log_main("ftok failed"); - $doexit = TRUE; break; } @@ -2110,37 +2267,49 @@ class Room { $shm_sz = SHM_DIMS_MIN; if ($shm = shm_attach($tok, $shm_sz)) { - $room = @shm_get_var($shm, $tok); - - log_only("bri == ".($room == FALSE ? "FALSE" : "TRUE")." bri === ".($room === FALSE ? "FALSE" : "TRUE")." bri isset ".(isset($room) ? "TRUE" : "FALSE")); - if (isset($room)) - log_only("bri count ".count($room)); - - if ($room == FALSE) { - log_only("INIT MAIN DATA"); - - $room =& Room::init_data(); - if (@shm_put_var($shm, $tok, $room) == FALSE) { - log_only("PUT_VAR FALLITA ".strlen(serialize($room))); - log_only(serialize($room)); - } - } - $room->shm_sz = $shm_sz; - - shm_detach($shm); + $room = @shm_get_var($shm, $tok); + + log_only("bri == ".($room == FALSE ? "FALSE" : "TRUE")." bri === ".($room === FALSE ? "FALSE" : "TRUE")." bri isset ".(isset($room) ? "TRUE" : "FALSE")); + if (isset($room)) + log_only("bri count ".count($room)); + + if ($room == FALSE) { + log_only("INIT MAIN DATA"); + shm_detach($shm); + + $room = Room::create(); + + if (Room::save_data($room) == FALSE) + return FALSE; + + return $room; + } + $room->shm_sz = $shm_sz; + + shm_detach($shm); + + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + if (($room->user[$i] = User::load_data($i, FALSE)) == FALSE) { + log_crit("Bin5_user::load_data failed"); + break; + } + } + if ($i < MAX_PLAYERS) { + break; + } } - $ret = &$room; - return ($ret); + + // + // SHSPLIT: load users from the shared memory + // + return ($room); } while (0); - if ($doexit) - exit(); - - return ($G_false); + return (FALSE); } - function save_data(&$room) + function save_data_orig($room) { GLOBAL $sess; @@ -2174,32 +2343,83 @@ class Room { return (FALSE); } - function lock_data() + + function save_data($room) { - GLOBAL $sess; + GLOBAL $sess; - // echo "LOCK: ".FTOK_PATH."/main"; - // exit; - if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) { - return (FALSE); - } - // echo "FTOK ".$tok."
"; - if (($res = sem_get($tok)) == FALSE) { - return (FALSE); - } - if (sem_acquire($res)) { - log_lock("LOCK room"); - return ($res); - } - else - return (FALSE); + $ret = FALSE; + $shm = FALSE; + + if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) + return (FALSE); + + // SHSPLIT: before save the $room you must save users, + // detach from main struct and (then) reattach + $user_park = array(); + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + $user_park[$i] = $room->user[$i]; + $room->user[$i] = FALSE; + } + + while ($room->shm_sz < SHM_DIMS_MAX) { + if (($shm = shm_attach($tok, $room->shm_sz)) == FALSE) + break; + + // log_only("PUT_VAR DI ".strlen(serialize($room))); + if (shm_put_var($shm, $tok, $room) != FALSE) { + $ret = TRUE; + break; + } + if (shm_remove($shm) === FALSE) { + log_only("REMOVE FALLITA"); + break; + } + shm_detach($shm); + $room->shm_sz += SHM_DIMS_DLT; + } + + if ($shm) + shm_detach($shm); + + // SHSPLIT: reattach users to the room class + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + User::save_data($user_park[$i], $i); + $room->user[$i] = $user_park[$i]; + } + log_load("FINISH: ".($ret == TRUE ? "TRUE" : "FALSE")); + + return ($ret); + } + + static function lock_data() + { + GLOBAL $sess; + + // echo "LOCK: ".FTOK_PATH."/main"; + // exit; + if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) { + return (FALSE); + } + // echo "FTOK ".$tok."
"; + if (($res = sem_get($tok)) == FALSE) { + return (FALSE); + } + if (sem_acquire($res)) { + self::$delta_t = microtime(TRUE); + log_lock("LOCK room [".self::$delta_t."]"); + + return ($res); + } + else + return (FALSE); } - function unlock_data($res) + static function unlock_data($res) { GLOBAL $sess; - log_lock("UNLOCK room"); + log_lock("UNLOCK room [".(microtime(TRUE) - (self::$delta_t))."]"); return (sem_release($res)); } @@ -2213,8 +2433,8 @@ class Room { if ($user->stat != 'room') return; - for ($e = 0 , $ct = 0 ; $ct < 4 && $e < MAX_PLAYERS ; $e++) { - if ($this->user[$e]->sess == "" || $this->user[$e]->stat != "room" || $this->user[$e]->name == "") + for ($i = 0 , $ct = 0 ; $ct < 4 && $i < MAX_PLAYERS ; $i++) { + if ($this->user[$i]->sess == "" || $this->user[$i]->stat != "room" || $this->user[$i]->name == "") continue; $ct++; } @@ -2223,20 +2443,19 @@ class Room { $content = ' j_stand_cont( [ '; - for ($e = 0 , $ct = 0 ; $e < MAX_PLAYERS ; $e++) { - if ($this->user[$e]->sess == "" || $this->user[$e]->stat != "room" || $this->user[$e]->name == "") + for ($i = 0 , $ct = 0 ; $i < MAX_PLAYERS ; $i++) { + if ($this->user[$i]->sess == "" || $this->user[$i]->stat != "room" || $this->user[$i]->name == "") continue; - $flags = $this->user[$e]->flags; + $flags = $this->user[$i]->flags; - if ($this->user[$e]->subst == "standup") { - if ($this->user[$e] == $user) - { - $flags |= 1; + if ($this->user[$i]->subst == "standup") { + if ($user->idx_get() == $i) { + $flags |= 1; } - - $content .= sprintf('%s[ %d, "%s" ]',($ct > 0 ? ', ' : ''), $flags, xcape($this->user[$e]->name)); - $ct++; + + $content .= sprintf('%s[ %d, "%s" ]',($ct > 0 ? ', ' : ''), $flags, xcape($this->user[$i]->name)); + $ct++; } } $content .= ' ]);'; @@ -2254,23 +2473,23 @@ class Room { // $sess = $user->sess; - $table = &$this->table[$table_idx]; + $table = $this->table[$table_idx]; if ($user->stat != 'room') return; $content = "[ "; for ($i = 0 ; $i < $table->player_n ; $i++) { - $user_cur = &$this->user[$table->player[$i]]; - - $flags = $user_cur->flags; - - if ($user_cur == $user) - $flags |= 1; - - log_main($user_cur->name. sprintf(" IN TABLE [%d]", $table_idx)); - - $content .= sprintf('%s[ %d, "%s" ]',($i == 0 ? '' : ', '), $flags, xcape($user_cur->name)); + $user_cur = $this->user[$table->player[$i]]; + + $flags = $user_cur->flags; + + if ($user->idx_get() == $table->player[$i]) + $flags |= 1; + + log_main($user_cur->name. sprintf(" IN TABLE [%d]", $table_idx)); + + $content .= sprintf('%s[ %d, "%s" ]',($i == 0 ? '' : ', '), $flags, xcape($user_cur->name)); } $content .= ' ]'; @@ -2280,6 +2499,49 @@ class Room { return ($ret); } + static function garbage_time_is_expired($tm) + { + $ret = TRUE; + $fp = FALSE; + do { + if (file_exists(PROXY_PATH) == FALSE) + mkdir(PROXY_PATH, 0775, TRUE); + if (($fp = @fopen(PROXY_PATH."/garbage_time.expired", 'rb')) == FALSE) + break; + if (($s = fread($fp, 4)) == FALSE) + break; + if (mb_strlen($s, "ASCII") != 4) + break; + $arr = unpack('Le', $s); + if ($arr['e'] > $tm) + $ret = FALSE; + } while (0); + + if ($fp != FALSE) + fclose($fp); + + log_rd2("END: return ".($ret ? "TRUE" : "FALSE")); + + return ($ret); + } + + static function garbage_time_expire_set($tm) + { + do { + if (file_exists(PROXY_PATH) == FALSE) + mkdir(PROXY_PATH, 0775, TRUE); + if (($fp = @fopen(PROXY_PATH."/garbage_time.expired", 'wb')) == FALSE) + break; + fwrite($fp, pack("L",$tm)); + fclose($fp); + + return (TRUE); + } while (0); + + return (FALSE); + } + + } // end class Room function make_seed() @@ -2288,245 +2550,323 @@ function make_seed() return (float) $sec + ((float) $usec * 100000); } +function btrace_line($ar) +{ + GLOBAL $G_btrace_pref_sub; -function log_mop($step, $log) { - GLOBAL $sess, $PHP_SELF; - - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LMOP) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; - - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LMOP) == 0) - return; - - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("LMOP: [%f] [%05d] [%s] [%s]\n", gettimeofday(TRUE), $step, $PHP_SELF, $log)); - fclose($fp); - } + $ret = ""; + for ($i = 0 ; $i < count($ar) ; $i++) { + $with_class = isset($ar[$i]['class']); + $with_file = isset($ar[$i]['file']); + $ret .= sprintf("%s%s%s (%s:%d)", ($i == 0 ? "" : ", "), + ($with_class ? $ar[$i]['class'].$ar[$i]['type'] : ""), + $ar[$i]['function'], ($with_file ? str_replace($G_btrace_pref_sub, "", $ar[$i]['file']) : ""), + ($with_file ? $ar[$i]['line'] : "")); + } + + return ($ret); } - -function log_only2($log) { - GLOBAL $sess, $PHP_SELF; - - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONL2) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; - - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONL2) == 0) - return; - - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("ONL2: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); - fclose($fp); - } +function log_mop($step, $log) +{ + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LMOP) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LMOP) == 0) + return; + + if (BRISK_DEBUG & DBG_TRAC) + $btrace = btrace_line(debug_backtrace()); + else + $btrace = ""; + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("LMOP: [%f] [%05d] [%s] [%s]\n", gettimeofday(TRUE), $step, $log, $btrace)); + fclose($fp); + } } -function log_crit($log) { - GLOBAL $sess, $PHP_SELF; - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_CRIT) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; - - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_CRIT) == 0) - return; - - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("CRIT: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); - fclose($fp); - } +function log_only2($log) +{ + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONL2) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONL2) == 0) + return; + + if (BRISK_DEBUG & DBG_TRAC) + $btrace = btrace_line(debug_backtrace()); + else + $btrace = ""; + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("ONL2: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } } -function log_only($log) { - GLOBAL $sess, $PHP_SELF; - - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONLY) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; - - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONLY) == 0) - return; - - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("ONLY: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); - fclose($fp); - } +function log_crit($log) +{ + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_CRIT) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_CRIT) == 0) + return; + + if (BRISK_DEBUG & DBG_TRAC) + $btrace = btrace_line(debug_backtrace()); + else + $btrace = ""; + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("CRIT: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } } -function log_main($log) { +function log_only($log) +{ GLOBAL $sess, $PHP_SELF; - - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_MAIN) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; - - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_MAIN) == 0) - return; - - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("MAIN: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); - fclose($fp); - } + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONLY) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONLY) == 0) + return; + + if (BRISK_DEBUG & DBG_TRAC) + $btrace = btrace_line(debug_backtrace()); + else + $btrace = ""; + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("ONLY: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } } -function log_rd($log) { - GLOBAL $sess, $PHP_SELF; - - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_READ) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; - - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_READ) == 0) - return; - - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("READ: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); - fclose($fp); - } +function log_main($log) +{ + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_MAIN) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_MAIN) == 0) + return; + + if (BRISK_DEBUG & DBG_TRAC) + $btrace = btrace_line(debug_backtrace()); + else + $btrace = ""; + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("MAIN: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } } -function log_rd2($log) { - GLOBAL $sess, $PHP_SELF; - - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_REA2) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; - - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_REA2) == 0) - return; +function log_rd($log) +{ + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_READ) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_READ) == 0) + return; - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("REA2: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); - fclose($fp); - } + if (BRISK_DEBUG & DBG_TRAC) + $btrace = btrace_line(debug_backtrace()); + else + $btrace = ""; + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("READ: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } } -function log_send($log) { - GLOBAL $sess, $PHP_SELF; - - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_SEND) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; - - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_SEND) == 0) - return; - - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("SEND: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); - fclose($fp); - } +function log_rd2($log) +{ + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_REA2) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_REA2) == 0) + return; + + if (BRISK_DEBUG & DBG_TRAC) + $btrace = btrace_line(debug_backtrace()); + else + $btrace = ""; + + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("REA2: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } } -function log_lock($log) { - GLOBAL $sess, $PHP_SELF; - - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOCK) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; - - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOCK) == 0) - return; - - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("LOCK: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); - fclose($fp); - } +function log_send($log) +{ + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_SEND) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_SEND) == 0) + return; + + if (BRISK_DEBUG & DBG_TRAC) + $btrace = btrace_line(debug_backtrace()); + else + $btrace = ""; + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("SEND: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } } -function log_wr($log) { - GLOBAL $sess, $PHP_SELF; - - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_WRIT) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; - - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_WRIT) == 0) - return; - - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("WRIT: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); - fclose($fp); - } +function log_lock($log) +{ + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOCK) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOCK) == 0) + return; + + if (BRISK_DEBUG & DBG_TRAC) + $btrace = btrace_line(debug_backtrace()); + else + $btrace = ""; + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("LOCK: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } } -function log_load($log) { - GLOBAL $sess, $PHP_SELF; - - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOAD) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; +function log_wr($log) +{ + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_WRIT) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_WRIT) == 0) + return; + + if (BRISK_DEBUG & DBG_TRAC) + $btrace = btrace_line(debug_backtrace()); + else + $btrace = ""; + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("WRIT: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } +} - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOAD) == 0) - return; - - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("LOAD: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); - fclose($fp); - } +function log_load($log) +{ + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOAD) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOAD) == 0) + return; + + if (BRISK_DEBUG & DBG_TRAC) + $btrace = btrace_line(debug_backtrace()); + else + $btrace = ""; + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("LOAD: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } } -function log_auth($sess, $log) { +function log_auth($sess, $log) +{ GLOBAL $PHP_SELF; - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_AUTH) == 0) - return; - if (( (BRISK_DEBUG | ($sess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_AUTH) == 0) - return; - - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("AUTH: [%s] [%d] [%s] [%s]\n", $sess, time(), $PHP_SELF, $log)); - fclose($fp); - } + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_AUTH) == 0) + return; + + if (( (BRISK_DEBUG | ($sess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_AUTH) == 0) + return; + + if (BRISK_DEBUG & DBG_TRAC) + $btrace = btrace_line(debug_backtrace()); + else + $btrace = ""; + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("LOAD: [%s] [%d] [%s] [%s]\n", $sess, time(), $log, $btrace)); + fclose($fp); + } } // function log_legal($curtime, $sess, $name, $where, $mesg) -function log_legal($curtime, &$user, $where, $mesg) +function log_legal($curtime, $user, $where, $mesg) { GLOBAL $_SERVER; @@ -2539,43 +2879,6 @@ function log_legal($curtime, &$user, $where, $mesg) } } -function log_points($curtime, &$user, $where, $mesg) -{ - GLOBAL $_SERVER; - - if (($fp = @fopen(LEGAL_PATH."/points.log", 'a')) != FALSE) { - /* Unix time | session | nickname | IP | where was | mesg */ - fwrite($fp, sprintf("%ld|%s|%s|%s|%s|%s|%s|\n", $curtime, $user->sess, - ($user->flags & USER_FLAG_AUTH ? 'A' : 'N'), - $user->name, $_SERVER['REMOTE_ADDR'], $where , $mesg)); - fclose($fp); - } -} - - - - -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)); -} - function table_act_content($isstanding, $sitted, $table, $cur_table, $allowed) { $ret = ""; @@ -2660,6 +2963,8 @@ function secstoword($secs) { GLOBAL $G_lang; + $ret = ""; + $mins = floor($secs / 60); $secs = $secs % 60; if ($G_lang == 'en') { @@ -2693,6 +2998,8 @@ function sharedmem_sz($tok) } class Warrant { + static $delta_t; + function lock_data() { GLOBAL $sess; @@ -2705,7 +3012,8 @@ class Warrant { return (FALSE); } if (sem_acquire($res)) { - log_lock("LOCK warrant"); + self::$delta_t = microtime(TRUE); + log_lock("LOCK warrant [".self::$delta_t."]"); return ($res); } else @@ -2716,13 +3024,15 @@ class Warrant { { GLOBAL $sess; - log_lock("UNLOCK warrant"); - + log_lock("UNLOCK warrant [".(microtime(TRUE) - (self::$delta_t))."]"); + return (sem_release($res)); } } class Poll { + static $delta_t; + function lock_data() { GLOBAL $sess; @@ -2734,9 +3044,11 @@ class Poll { if (($res = sem_get($tok)) == FALSE) { return (FALSE); } - if (sem_acquire($res)) { - log_lock("LOCK poll"); - return ($res); + if (sem_acquire($res)) { + self::$delta_t = microtime(TRUE); + log_lock("LOCK poll [".self::$delta_t."]"); + + return ($res); } else return (FALSE); @@ -2746,7 +3058,7 @@ class Poll { { GLOBAL $sess; - log_lock("UNLOCK poll"); + log_lock("UNLOCK poll [".(microtime(TRUE) - (self::$delta_t))."]"); return (sem_release($res)); }