require_once("$DOCUMENT_ROOT/Etc/".BRISK_CONF);
require_once("${G_base}Obj/ipclass.phh");
-require_once("${G_base}Obj/provider_proxy.phh");
$mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
'en' => 'back standing' ),
$G_lng = langtolng($G_lang);
$G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "4.18.1";
+$G_brisk_version = "4.18.3";
/* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: Puffin riattivato, accessi da cloud disattivati.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: Puffin riattivato, accessi da cloud disattivati, corretto bug sulla gestione di puffin, riabilitato blocco dei proxy.',
'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>: Puffin re-enabled, cloud accesses disabled.',
+ 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NEWS</b>: Puffin re-enabled, cloud accesses disabled, fixed puffin mgmt bug, re-enabled proxy access block.',
'If you want to subscribe our <a target="_blank" href="ml-briscola+subscribe@milug.org">Mailing List</a>, click it!' ) );
$G_room_help = array( 'it' => '
var $ban_list; // ban list (authized allowed)
var $black_list; // black list (anti-dos, noone allowed)
var $cloud_smasher; // list of cloud ip ranges to be rejected
- var $provider_proxy; // list of provider/browser that offer proxy service
var $ghost_sess;
var $delay_mgr;
}
// constructor
- static function create($crystal_filename, $ban_list, $black_list, $cloud_smasher, $prov_proxy) {
+ static function create($crystal_filename, $ban_list, $black_list, $cloud_smasher) {
if (($brisk_ser = @file_get_contents($crystal_filename)) != FALSE) {
if (($brisk = unserialize($brisk_ser)) != FALSE) {
fprintf(STDERR, "ROOM FROM FILE\n");
rename($crystal_filename, $crystal_filename.".old");
- $brisk->reload(TRUE, $ban_list, $black_list, $cloud_smasher, $prov_proxy);
+ $brisk->reload(TRUE, $ban_list, $black_list, $cloud_smasher);
return($brisk);
}
$thiz->ban_list = IpClass::create();
$thiz->black_list = IpClass::create();
$thiz->cloud_smasher = IpClass::create();
- $thiz->provider_proxy = ProviderProxy::create();
$thiz->ghost_sess = new GhostSess();
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
static::$sess_cur = FALSE;
- $thiz->reload(TRUE, $ban_list, $black_list, $cloud_smasher, $prov_proxy);
+ $thiz->reload(TRUE, $ban_list, $black_list, $cloud_smasher);
return ($thiz);
}
- function reload($is_first, $ban_list, $black_list, $cloud_smasher, $prov_proxy)
+ function reload($is_first, $ban_list, $black_list, $cloud_smasher)
{
- fprintf(STDERR, "RELOAD STUFF (%d)(%d)(%d)(%d)\n",
- count($ban_list), count($black_list), count($cloud_smasher), count($prov_proxy));
+ fprintf(STDERR, "RELOAD STUFF (%d)(%d)(%d)\n",
+ count($ban_list), count($black_list), count($cloud_smasher));
if (defined('CURL_DE_SAC_VERS')) {
if (brisk_cds_reload($this) == FALSE) {
$this->ban_list->update($ban_list);
$this->black_list->update($black_list);
$this->cloud_smasher->update($cloud_smasher);
- $this->provider_proxy->update($prov_proxy);
if (!$is_first) {
$this->banned_kickoff();
return ($this->cloud_smasher->check($ip_str));
}
- function pproxy_realip($header, $ip_str)
- {
- return ($this->provider_proxy->realip($header, $ip_str));
- }
-
function users_cleanup()
{
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
function request_mgr(&$s_a_p, $header, &$header_out, &$new_socket, $path, $addr, $get, $post, $cookie)
{
- GLOBAL $G_ban_list, $G_black_list, $G_cloud_smasher, $G_provider_proxy;
+ GLOBAL $G_ban_list, $G_black_list, $G_cloud_smasher;
printf("NEW_SOCKET (root): %d PATH [%s]\n", intval($new_socket), $path);
- // $remote_addr = addrtoipv4($addr);
- $remote_addr = $this->pproxy_realip($header, addrtoipv4($addr));
- fprintf(STDERR, "\n\n\n PRE_BLACK [%s]\n\n\n", $remote_addr);
- if ($this->black_check($remote_addr)) {
+ fprintf(STDERR, "\n\n\n PRE_BLACK [%s]\n\n\n", $addr);
+ if ($this->black_check($addr)) {
// TODO: waiting async 5 sec before close
fprintf(STDERR, "\n\n\n BLACK CHECK\n\n\n");
return (FALSE);
}
if ($path != "" && $path != "index.php") {
- if ($this->cloud_check($remote_addr)) {
+ if ($this->cloud_check($addr)) {
// TODO: waiting async 5 sec before close
return (FALSE);
}