define('WAKEUP_TIME', 12);
// BAN_TIME da allineare anche in commons.js
define('BAN_TIME', 3600);
-define('GARBAGE_TIMEOUT', 10);
+define('GARBAGE_TIMEOUT', 5);
define('NICKSERV', "<i>BriskServ</i>");
define('LOCK_SHARE_MAX', 10000);
define('DBG_LMOP', 0x0800);
define('DBG_TRAC', 0x1000);
define('DBG_SHME', 0x2000);
+define('DBG_ENGI', 0x4000);
// NOTE: BRISK DEBUG must be a numerical constant, not the result of operations on symbols
define('BRISK_DEBUG', 0x0800);
$G_lng = langtolng($G_lang);
$G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "4.5.3";
+$G_brisk_version = "4.6.0";
/* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: nuova visualizzazione dello stato della connessione dati, indirizzo IP sorgente memorizzato correttamente nei log, risolte alcune inconsistenze.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: aggiunti script di avvio automatico, gestione dei segnali e logging dell\' ultima connessione.',
'Se vuoi iscriverti alla <a target="_blank" href="mailto:ml-briscola+subscribe@milug.org">Mailing List</a>, cliccala!' ),
'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NEWS</b>: usage of reader/writer locking instead of generic exclusive locking.',
'If you want to subscribe our <a target="_blank" href="ml-briscola+subscribe@milug.org">Mailing List</a>, click it!' ) );
} // end class Table
+class Delay_Manager
+{
+ var $delta;
+ var $lastckeck;
+ var $triglevel;
+
+ function Delay_Manager($triglevel)
+ {
+ $this->triglevel = $triglevel;
+ $this->delta = array();
+ $this->lastcheck = 0;
+ }
+
+ function delta_get($curtime)
+ {
+ // clean too old delta items
+ for ($i = 0 ; $i < count($this->delta) ; $i++) {
+ if ($this->delta[$i][0] < $curtime) {
+ array_splice($this->delta, $i, 1);
+ $i--;
+ }
+ }
+
+ // add new delta items if delay exceeded $this->triglevel sec
+ if ($curtime > $this->lastcheck + $this->triglevel && $curtime < $this->lastcheck + 1200.0) {
+ $delta = $curtime - $this->lastcheck - $this->triglevel;
+ array_push($this->delta, array($curtime + $delta , $delta));
+ // fprintf(STDERR, "DELTA: add new delta [%f] [%f] [%f]\n", $this->triglevel, $curtime + $delta, $delta);
+ }
+
+ // extract the maximum valid delta
+ $delta_max = 0.0;
+ for ($i = 0 ; $i < count($this->delta) ; $i++) {
+ $delta_cur = $this->delta[$i][1];
+ if ($delta_max < $delta_cur)
+ $delta_max = $delta_cur;
+ }
+
+ // fprintf(STDERR, "DELTA: status %d, delta_max: %f\n", count($this->delta), $delta_max);
+
+ return ($delta_max);
+ }
+
+ function lastcheck_set($curtime)
+ {
+ $this->lastcheck = $curtime;
+ }
+}
+
+class Client_prefs {
+ var $listen;
+
+ function Client_prefs()
+ {
+ }
+
+ static function from_user($user)
+ {
+ $thiz = new Client_prefs();
+ $thiz->user_load($user);
+
+ return ($thiz);
+ }
+
+ static function from_json($json)
+ {
+ $thiz = new Client_prefs();
+ if ($thiz->json_load($json) == FALSE) {
+ return (FALSE);
+ }
+
+ return ($thiz);
+ }
+
+ function user_load($user)
+ {
+ fprintf(STDERR, "QQ %s: %x\n", __FUNCTION__, $user->flags);
+ $this->listen = ($user->flags & USER_FLAG_MAP_AUTH) >> 2;
+
+ fprintf(STDERR, "QQ %s: LISTEN: %d\n", __FUNCTION__, $this->listen);
+ }
+
+ function json_load($json_s)
+ {
+ if (gettype($json_s) == "string") {
+ if (($json = json_decode($json_s)) == FALSE)
+ return FALSE;
+ }
+ else {
+ $json = $json_s;
+ }
+ $this->listen = $json->listen;
+
+ return TRUE;
+ }
+
+ function store($user, $is_save)
+ {
+ // save into DB
+ fprintf(STDERR, "QQ %s::%s PRE: %x\n", __CLASS__, __FUNCTION__,
+ $user->flags & (~USER_FLAG_S_ALL & ~USER_FLAG_AUTH));
+ $user->flags_set(($this->listen << 2), USER_FLAG_MAP_AUTH);
+ fprintf(STDERR, "QQ %s::%s %x\n", __CLASS__, __FUNCTION__,
+ $user->flags);
+ if ($is_save)
+ $user->store_set();
+ }
+}
class Room
var $garbage_timeout;
var $shm_sz;
+ var $delay_mgr;
+
function Room ($crystal_filename) {
$this->crystal_filename = $crystal_filename;
$this->user = array();
}
$this->garbage_timeout = 0;
$this->shm_sz = SHM_DIMS_MIN;
+
+ $this->delay_mgr = new Delay_Manager(1.5);
}
function garbage_manager($force)
log_rd2("garbage_manager START");
/* Garbage collector degli utenti in timeout */
- $curtime = time();
+ $curtime = microtime(TRUE);
+
+ $delta = $this->delay_mgr->delta_get($curtime);
if (!$force && !($this->garbage_timeout < $curtime)) {
+ $this->delay_mgr->lastcheck_set($curtime);
return ($ismod);
}
$bri = FALSE;
}
-
if ($bri != FALSE) {
//
// SPAWN: JOIN
if ($user_cur->sess == "")
continue;
- if ($user_cur->lacc + EXPIRE_TIME_RD < $curtime) {
+ if ($user_cur->lacc + EXPIRE_TIME_RD < ($curtime - $delta)) {
// Auto logout dell'utente
- log_rd2("AUTO LOGOUT.".($user_cur->lacc + EXPIRE_TIME_RD)." curtime ".$curtime);
+ log_rd2("AUTO LOGOUT.".($user_cur->lacc + EXPIRE_TIME_RD)." curtime - delta ".($curtime - $delta));
if ($user_cur->stat == 'table' || $user_cur->stat == 'room') {
log_auth($user_cur->sess, "Autologout session.");
}
}
- if ($user_cur->laccwr + EXPIRE_TIME_SMAMMA < $curtime) { // lo rimettiamo in piedi
+ if ($user_cur->laccwr + EXPIRE_TIME_SMAMMA < ($curtime - $delta)) { // lo rimettiamo in piedi
if ($user_cur->stat == 'room' && $user_cur->subst == 'sitdown') {
$this->room_wakeup($user_cur);
$user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
$this->garbage_timeout = $curtime + GARBAGE_TIMEOUT;
$ismod = TRUE;
+ $this->delay_mgr->lastcheck_set($curtime);
return ($ismod);
}
$ret = sprintf('gst.st = %d; ', $user_step);
- if ($user->flags & USER_FLAG_ISOLAUTH) {
- $ret .= 'list_set(\'isolation\', false, \''.$mlang_brisk['tit_onisol'][$G_lang].'\' ); ';
- }
- else if ($user->flags & USER_FLAG_LISTAUTH) {
- $ret .= 'list_set(\'auth\', false, \''.$mlang_brisk['tit_onauth'][$G_lang].'\' ); ';
- }
- else {
- $ret .= 'list_set(\'all\', false, \'\' ); ';
+ $prefs = Client_prefs::from_user($user);
+ $ret .= sprintf('prefs_load(\'%s\', false, false);', json_encode($prefs));
+
+ if(false) {
+ if ($user->flags & USER_FLAG_ISOLAUTH) {
+ $ret .= 'list_set(\'isolation\', false, \''.$mlang_brisk['tit_onisol'][$G_lang].'\' ); ';
+ }
+ else if ($user->flags & USER_FLAG_LISTAUTH) {
+ $ret .= 'list_set(\'auth\', false, \''.$mlang_brisk['tit_onauth'][$G_lang].'\' ); ';
+ }
+ else {
+ $ret .= 'list_set(\'all\', false, \'\' ); ';
+ }
}
if ($user->subst == 'standup')
$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($cookie['CO_list'])) {
- if (strcmp($cookie['CO_list'], "auth") == 0) {
- $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH;
- $this->user[$idx]->flags |= USER_FLAG_LISTAUTH;
- }
- if (strcmp($cookie['CO_list'], "isolation") == 0) {
- $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH;
- $this->user[$idx]->flags |= USER_FLAG_ISOLAUTH;
+ $this->user[$idx]->code = $authenticate->code_get();
+ if (0 == 1) {
+ // all this part is included in the db server
+ $this->user[$idx]->flags |= USER_FLAG_LISTAUTH;
+
+ if (isset($cookie['CO_list'])) {
+ fprintf(STDERR, "QQ: %s CO_list: [%s]\n", __FUNCTION__, $cookie['CO_list']);
+ if (strcmp($cookie['CO_list'], "auth") == 0) {
+ $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH;
+ $this->user[$idx]->flags |= USER_FLAG_LISTAUTH;
+ }
+ if (strcmp($cookie['CO_list'], "isolation") == 0) {
+ $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH;
+ $this->user[$idx]->flags |= USER_FLAG_ISOLAUTH;
+ }
+ else {
+ $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH;
+ }
+ }
}
else {
- $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH;
+ fprintf(STDERR, "QQ: CO_list not set flags: %x\n", __FUNCTION__, $this->user[$idx]->flags);
}
- }
}
-
+ fprintf(STDERR, "QQ %s: flag %x\n", __FUNCTION__, $this->user[$idx]->flags);
if ($ghost > -1) {
log_main("ghost: rename!");
$ghost_user = $this->user[$ghost];
}
else {
fprintf(STDERR, "ROOM FROM FILE\n");
+ rename($crystal_filename, $crystal_filename.".old");
}
return $room;
function request_mgr(&$s_a_p, $header, &$header_out, &$new_socket, $path, $addr, $get, $post, $cookie)
{
- printf("NEW_SOCKET (root): %d\n", intval($new_socket));
+ printf("NEW_SOCKET (root): %d PATH [%s]\n", intval($new_socket), $path);
$enc = get_encoding($header);
if (isset($header['User-Agent'])) {
$content = ob_get_contents();
ob_end_clean();
- $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content);
+ // fprintf(STDERR, "\n\nCONTENT [%s]\n\n", $content);
+ $s_a_p->pendpage_try_addflush($new_socket, 20, $enc, $header_out, $content);
return TRUE;
break;
case "index_wr.php":
+ //
+ // Enhance required: in the POST case, after the header you must get content
+ // from the socket, waiting if necessary
+ //
+
+ fprintf(STDERR, "\n\nDENTRO QUI\n\n");
ob_start();
index_wr_main($this, $addr, $get, $post, $cookie);
$content = ob_get_contents();
ob_end_clean();
- $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content);
+ $s_a_p->pendpage_try_addflush($new_socket, 20, $enc, $header_out, $content);
return TRUE;
break;
$content = User::stream_fini($transp, $s_a_p->rndstr, TRUE);
- $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content);
+ $s_a_p->pendpage_try_addflush($new_socket, 20, $enc, $header_out, $content);
return TRUE;
break;
fflush($new_socket);
- $s_a_p->socks_set($new_socket, $user);
+ $s_a_p->socks_set($new_socket, $user, NULL);
$user->rd_socket_set($new_socket);
printf(" - qui ci siamo - ");
return TRUE;
return FALSE;
break;
-
+ case 'test.php':
+ if (!(BRISK_DEBUG & DBG_ENGI))
+ return (FALSE);
+ fprintf(STDERR, "TEST.PHP running\n");
+ if (isset($post['data'])) {
+ $content = $post['data'];
+ }
+ else {
+ $content = "NO DATA AVAILABLE";
+ }
+ $header_out['Content-Type'] = 'text/plain';
+ $s_a_p->pendpage_try_addflush($new_socket, 20, $enc, $header_out, $content);
+ return TRUE;
+ break;
default:
/* FAR TODO: move all into an array of registered sub-apps */
$subs = "briskin5/";
projects / brisk.git / blobdiff