X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2FObj%2Fbrisk.phh;h=7f2689484a37763792fc0ce78eecd9ca92cd9940;hb=3acc6cae843ca6f74272e76eb2650c8674840c85;hp=caf5111727eb390e77907ac9fb6e038d36829d13;hpb=0980e055a006803ca87e630a35a3d99cd00500c9;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index caf5111..7f26894 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -2,7 +2,7 @@
/*
* brisk - brisk.phh
*
- * Copyright (C) 2006-2007 matteo.nastasi@milug.org
+ * Copyright (C) 2006-2008 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
@@ -19,16 +19,25 @@
*
*/
+
+define(BRISK_CONF, "brisk.conf.pho");
define(FTOK_PATH, "/var/lib/brisk");
define(LEGAL_PATH, "/tmp/legal_brisk");
define(PROXY_PATH, "/var/lib/brisk_proxy");
-define(TABLES_N, 12);
+define(TABLES_N, 20);
define(PLAYERS_N, 3);
define(MAX_POINTS, 5);
define(MAX_PLAYERS, (20 + (PLAYERS_N * TABLES_N)));
-define(SHM_DIMS, (50000 + 10000 * TABLES_N + 15000 * MAX_PLAYERS));
-define(COMM_N, 12);
+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(COMM_N, 18);
define(COMM_GEN_N, 50);
+
+define(CHAT_N, 3);
+define(CHAT_ILL_TIME, 6);
+
define(SESS_LEN, 13);
define(STREAM_TIMEOUT, 20);
define(EXPIRE_TIME_RD, 180);
@@ -48,16 +57,25 @@ define(DBG_LOCK, 0x0040);
define(DBG_WRIT, 0x0080);
define(DBG_LOAD, 0x0100);
define(DBG_AUTH, 0x0200);
+define(DBG_CRIT, 0x0400);
define(BRISK_DEBUG, 0);
+
+define(BRISK_SINGLE_DEBUG,0);
+define(BRISK_SINGLE_SESS, "");
// define(DEBUGGING, "local");
+$DBASE = "$DOCUMENT_ROOT".dirname("$PHP_SELF");
+
+require_once("$DBASE/".BRISK_CONF);
+
+
$G_false = FALSE;
$G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "spawn-0.0.9";
+$G_brisk_version = "spawn-0.10.8";
-$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), NOVITA\': chiuso il bug dei tavoli bianchi, versione beta.',
+$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), NOVITA\': i proxy verranno riabilitati con i login - versione beta2.',
'Se vuoi iscriverti alla Mailing List, cliccala!' );
$table_wellarr = Array ( 'Benvenuto al tavolo. Se almeno tre giocatori non sbloccano l\'uscita cliccando il lucchetto, chi esce non può risedersi a un qualunque tavolo per '.floor(BAN_TIME/60).' minuti.');
@@ -485,6 +503,11 @@ class User {
var $table_token;// token that identify a game on a table
var $the_end; // Flag to change the end of the session
+ var $chat_lst; // Last chat line
+ var $chattime; // Array of chat times
+ var $chat_cur; // Current chat line number
+ var $chat_ban; // Time for ban chat
+ var $chat_dlt; // Delta t for ban
function User() {
}
@@ -510,6 +533,12 @@ class User {
$thiz->handpt = -1;
$thiz->exitislock = TRUE;
+ $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 = $table;
$thiz->table_pos = -1;
$thiz->table_token = "";
@@ -545,6 +574,15 @@ class User {
$thiz->asta_pnt = $from->asta_pnt;
$thiz->handpt = $from->handpt;
$thiz->exitislock = $from->exitislock;
+
+ $thiz->chattime = array();
+ for ($i = 0 ; $i < CHAT_N ; $i++)
+ $thiz->chattime[$i] = $from->chattime[$i];
+ $thiz->chat_cur = $from->chat_cur;
+ $thiz->chat_lst = $from->chat_lst;
+ $thiz->chat_ban = $from->chat_ban;
+ $thiz->chat_dlt = $from->chat_dlt;
+
$thiz->table = $from->table;
$thiz->table_pos = $from->table_pos;
$thiz->table_token = $from->table_token;
@@ -572,19 +610,26 @@ class User {
$thiz->trans_step = $from->trans_step;
$thiz->comm = array();
+ /*
$i_start = (1 > ($from->step - COMM_N) ? 1 : ($from->step - COMM_N));
for ($i = $i_start ; $i < $from->step ; $i++) {
log_wr("TRY PUSH:".$i);
$ii = $i % COMM_N;
$thiz->comm[$ii] = $from->comm[$ii];
}
-
+ */
$thiz->asta_card = $from->asta_card;
$thiz->asta_pnt = $from->asta_pnt;
$thiz->handpt = $from->handpt;
$thiz->exitislock = $from->exitislock;
$thiz->the_end = $from->the_end;
+ $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 = $table;
$thiz->table_pos = $table_pos;
$thiz->table_token = $from->table_token;
@@ -622,8 +667,8 @@ class User {
return (FALSE);
}
- function step_inc() {
- $this->step++;
+ function step_inc($delta = 1) {
+ $this->step += $delta;
if (validate_sess($this->sess)) {
$fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w');
@@ -635,6 +680,16 @@ class User {
return (FALSE);
}
+
+ function reset() {
+ $tmp_sess = $this->sess;
+ $this->sess = "";
+ step_unproxy($tmp_sess);
+ $this->name = "";
+ while (array_pop($this->comm) != NULL);
+ $this->step = 0;
+ $this->the_end = FALSE;
+ }
} // end class User
@@ -680,6 +735,7 @@ class Room {
var $comm; // commands for many people
var $step; // current step of the comm array
var $garbage_timeout;
+ var $shm_sz;
function Room () {
$this->user = array();
@@ -769,14 +825,14 @@ class Room {
}
} // else if (($bri = &Briskin5::load_data($table_idx)) != FALSE) {
else if ($no_recovery == FALSE) {
- log_main("ERROR: table ".$table_idx." unrecoverable join");
+ 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->subst = "shutdowner";
$user_cur->step_inc();
- $ret = sprintf('stat = "%s"; subst = "%s";', $cur_user->stat, $cur_user->subst);
+ $ret = sprintf('stat = "%s"; subst = "%s";', $user_cur->stat, $user_cur->subst);
$ret .= "gst.st = ".($user_cur->step+1)."; ";
$ret .= show_notify("
I dati del tavolo n° ".$user_cur->table." sono inconsistenti, verranno resettati.
Torni in piedi.
", 2000, "Chiudi.", 400, 110);
$user_cur->comm[$user_cur->step % COMM_N] = $ret;
@@ -809,12 +865,16 @@ class Room {
if ($user_cur->stat == 'table' || $user_cur->stat == 'room') {
log_auth($user_cur->sess, "Autologout session.");
+ $user_cur->reset();
+ /* factorized with ->reset()
$tmp_sess = $user_cur->sess;
$user_cur->sess = "";
step_unproxy($tmp_sess);
$user_cur->name = "";
+ while (array_pop($user_cur->comm) != NULL);
$user_cur->step = 0;
$user_cur->the_end = FALSE;
+ */
log_rd2("AUTO LOGOUT.");
if ($user_cur->subst == 'sitdown' || $user_cur->stat == 'table')
@@ -995,6 +1055,11 @@ class Room {
// for users that wakeup the room will be reconstructed by index_rd.php
if ($tab_idx < $user_tab_n) {
log_main("PRE show_room username: ".$user_cur->name." STEP: ".$user_cur->step);
+
+// ARRAY_POP DISABLED
+// if ($trans_delta == 0)
+// while (array_pop($user_cur->comm) != NULL);
+
$user_cur->trans_step = $user_cur->step + 1 + $trans_delta;
$user_cur->comm[$user_cur->step % COMM_N] = "";
$user_cur->step_inc();
@@ -1090,6 +1155,8 @@ class Room {
function chatt_send(&$user, $mesg)
{
+ $only_you = FALSE;
+
if ($user->stat == 'table') {
$table = &$this->table[$user->table];
}
@@ -1170,6 +1237,24 @@ class Room {
}
}
else {
+ if ($timecur < ($user->chat_ban + $user->chat_dlt)) {
+ $only_you = TRUE;
+ $user->chat_dlt = $user->chat_dlt * 2;
+ if ($user->chat_dlt > 120)
+ $user->chat_dlt = 120;
+ }
+ else if ($user->chat_lst == $user_mesg)
+ $only_you = TRUE;
+ else if ($timecur - $user->chattime[($user->chat_cur + 1) % CHAT_N] < CHAT_ILL_TIME) {
+ $user->chat_ban = $timecur;
+ $user->chat_dlt = 5;
+ $only_you = TRUE;
+ }
+ else {
+ $user->chat_ban = 0;
+ $user->chat_dlt = 0;
+ }
+
for ($i = 0 ; $i < ($user->stat == 'room' ? MAX_PLAYERS : PLAYERS_N) ; $i++) {
if ($user->stat == 'room') {
$user_cur = &$this->user[$i];
@@ -1179,6 +1264,13 @@ class Room {
else {
$user_cur = &$this->user[$table->player[$i]];
}
+
+ if ($only_you) {
+ if ($user_cur != $user)
+ continue;
+ else
+ $user_mesg = "== chat ban ==";
+ }
$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");',
@@ -1187,6 +1279,10 @@ class Room {
}
log_legal($timecur, $user->sess, $user->name,
($user->stat == 'room' ? 'room' : 'table '.$user->table),$user_mesg);
+
+ $user->chat_lst = "$user_mesg";
+ $user->chattime[$user->chat_cur % CHAT_N] = $timecur;
+ $user->chat_cur++;
}
}
@@ -1319,34 +1415,47 @@ class Room {
function &load_data()
{
GLOBAL $G_false, $sess;
+ $doexit = FALSE;
+ do {
+ if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) {
+ log_main("ftok failed");
+ $doexit = TRUE;
+ break;
+ }
- if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) {
- echo "FTOK FAILED";
- exit;
- }
-
- if ($shm = shm_attach($tok, SHM_DIMS)) {
- $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");
+ if (($shm_sz = sharedmem_sz($tok)) == -1) {
+ log_main("shmop_open failed");
+ }
+
+ if ($shm_sz == -1)
+ $shm_sz = SHM_DIMS_MIN;
+
+ if ($shm = shm_attach($tok, $shm_sz)) {
+ $room = @shm_get_var($shm, $tok);
- $room =& Room::init_data();
- if (shm_put_var($shm, $tok, $room) == FALSE) {
- log_only("PUT_VAR FALLITA ".strlen(serialize($room)));
- log_only(serialize($room));
+ 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);
}
-
- shm_detach($shm);
-
$ret = &$room;
return ($ret);
- }
+ } while (0);
+
+ if ($doexit)
+ exit();
return ($G_false);
}
@@ -1358,29 +1467,29 @@ class Room {
$ret = FALSE;
$shm = FALSE;
- $isacq = FALSE;
// var_dump($room);
if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1)
return (FALSE);
- do {
- $isacq = TRUE;
-
- if (($shm = shm_attach($tok, SHM_DIMS)) == 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) {
- log_only("PUT_VAR FALLITA ".strlen(serialize($room)));
- log_only(serialize($room));
+ if (shm_put_var($shm, $tok, $room) != FALSE) {
+ shm_detach($shm);
+ return (TRUE);
+ }
+ if (shm_remove($shm) === FALSE) {
+ log_only("REMOVE FALLITA");
break;
}
- // log_main("QUI CI ARRIVA [".$room->user[0]->name."]");
- $ret = TRUE;
- } while (0);
-
+ shm_detach($shm);
+ $room->shm_sz += SHM_DIMS_DLT;
+ }
+
if ($shm)
shm_detach($shm);
@@ -1428,33 +1537,59 @@ function make_seed()
function log_only2($log) {
- if ((BRISK_DEBUG & DBG_ONL2) == 0)
- return;
-
GLOBAL $sess;
+ 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]\n", $ssess, $log));
fclose($fp);
}
}
-function log_only($log) {
- if ((BRISK_DEBUG & DBG_ONLY) == 0)
+function log_crit($log) {
+ GLOBAL $sess;
+
+ 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]\n", $ssess, $log));
+ fclose($fp);
+ }
+}
+
+function log_only($log) {
GLOBAL $sess;
+ 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]\n", $ssess, $log));
fclose($fp);
@@ -1462,16 +1597,19 @@ function log_only($log) {
}
function log_main($log) {
- if ((BRISK_DEBUG & DBG_MAIN) == 0)
- return;
-
GLOBAL $sess;
+ 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]\n", $ssess, $log));
fclose($fp);
@@ -1479,16 +1617,19 @@ function log_main($log) {
}
function log_rd($log) {
- if ((BRISK_DEBUG & DBG_READ) == 0)
- return;
-
GLOBAL $sess;
+ 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]\n", $ssess, $log));
fclose($fp);
@@ -1496,16 +1637,18 @@ function log_rd($log) {
}
function log_rd2($log) {
- if ((BRISK_DEBUG & DBG_REA2) == 0)
- return;
-
GLOBAL $sess;
+ 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 (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("REA2: [%s] [%s]\n", $ssess, $log));
@@ -1514,16 +1657,19 @@ function log_rd2($log) {
}
function log_send($log) {
- if ((BRISK_DEBUG & DBG_SEND) == 0)
- return;
-
GLOBAL $sess;
+ 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]\n", $ssess, $log));
fclose($fp);
@@ -1531,16 +1677,19 @@ function log_send($log) {
}
function log_lock($log) {
- if ((BRISK_DEBUG & DBG_LOCK) == 0)
- return;
-
GLOBAL $sess;
+ 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]\n", $ssess, $log));
fclose($fp);
@@ -1548,16 +1697,19 @@ function log_lock($log) {
}
function log_wr($log) {
- if ((BRISK_DEBUG & DBG_WRIT) == 0)
- return;
-
GLOBAL $sess;
+ 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]\n", $ssess, $log));
fclose($fp);
@@ -1565,15 +1717,18 @@ function log_wr($log) {
}
function log_load($log) {
- if ((BRISK_DEBUG & DBG_LOAD) == 0)
- return;
-
GLOBAL $sess;
+ 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 (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("LOAD: [%s] [%s]\n", $ssess, $log));
@@ -1582,7 +1737,10 @@ function log_load($log) {
}
function log_auth($sess, $log) {
- if ((BRISK_DEBUG & DBG_AUTH) == 0)
+ 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) {
@@ -2267,4 +2425,18 @@ function secstoword($secs)
return ($ret);
}
+function sharedmem_sz($tok)
+{
+ if (($shm_id = @shmop_open($tok, 'a', 0, 0)) == FALSE) {
+ log_main("shmop_open failed");
+ return (-1);
+ }
+ $shm_sz = shmop_size($shm_id);
+ shmop_close($shm_id);
+
+ log_main("shm_sz: ".$shm_sz." SHM_DIMS: ".SHM_DIMS);
+ return ($shm_sz);
+}
+
+
?>