X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fsac-a-push.phh;h=6efc241629b4443a1d38ec139ab2a16eb5a2a14c;hb=db5d6355c39327ba7f8052f360f1e846ba4ad01c;hp=a3fe932112e2a8ab33e5d971dcbb6881ee417a68;hpb=a0b24745843fc7bad6f8291ef6f660e255af7825;p=brisk.git diff --git a/web/Obj/sac-a-push.phh b/web/Obj/sac-a-push.phh index a3fe932..6efc241 100644 --- a/web/Obj/sac-a-push.phh +++ b/web/Obj/sac-a-push.phh @@ -22,7 +22,7 @@ * */ -define('SITE_PREFIX', '/brisk/'); +define('SITE_PREFIX', "/brisk/"); define('SITE_PREFIX_LEN', 7); define('DIRECT_ST_READ', 1); @@ -35,7 +35,7 @@ $_globals_list = array( 'G_admin_mail', 'G_alarm_passwd', 'G_all_points', 'G_ban_list', 'G_base', 'G_black_list', 'G_brisk_version', 'G_btrace_pref_sub', 'G_cloud_smasher', 'G_crypt_key', 'G_dbasetype', 'G_dbauth', 'G_dbpfx', 'G_doc_path', -'G_domain', 'G_donors_all', 'G_donors_cur', 'G_is_local', 'G_lang', 'G_lng', +'G_proto', 'G_domain', 'G_donors_all', 'G_donors_cur', 'G_is_local', 'G_lang', 'G_lng', 'G_mail_seed', 'G_notguar_code', 'G_PG_cons', 'G_PG_cons_n', 'G_PG_vow', 'G_PG_vow_n', 'G_poll_entries', 'G_poll_name', 'G_poll_title', 'G_provider_proxy', 'G_proxy_white_list', 'G_room_about', 'G_room_help', @@ -139,7 +139,7 @@ function spu_process_info($stream_info, &$method, &$header, &$get, &$post, &$coo $post = array(); $rest = 0; foreach(preg_split("/(\r?\n)/", $stream_info) as $line) { - printf("LINE: [%s]\n", $line); + // printf("LINE: [%s]\n", $line); if ($check_post) { if (!isset($header['The-Request'])) { return FALSE; @@ -173,7 +173,7 @@ function spu_process_info($stream_info, &$method, &$header, &$get, &$post, &$coo $path = $get_vars[0]; if (count($get_vars) > 1) { $a = explode('&', $get_vars[1]); - printf("A COUNT: [%s] %d\n", $a[0], count($a)); + // printf("A COUNT: [%s] %d\n", $a[0], count($a)); for ($i = 0 ; $i < count($a) ; $i++) { $b = explode('=', $a[$i]); if ($b[0] == "") @@ -195,7 +195,7 @@ function spu_process_info($stream_info, &$method, &$header, &$get, &$post, &$coo return FALSE; } $post_len = mb_strlen($line, "ASCII"); - printf("INFO: postlen: %d\n", $post_len); + // printf("INFO: postlen: %d\n", $post_len); $rest = (int)($header['Content-Length']) - $post_len; if ($rest == 0) { @@ -571,13 +571,13 @@ class Sac_a_push { function pendpage_try_addcont(&$new_socket, $tout, $method, $header, $get, $post, $cookie, $path, $addr, $rest, $cont) { - $pendpage = PendingPage::pendingpage_continue(&$new_socket, $this->curtime, $tout, $method, + $pendpage = PendingPage::pendingpage_continue( $new_socket, $this->curtime, $tout, $method, $header, $get, $post, $cookie, $path, $addr, $rest, $cont); $pendpage->try_flush($this->curtime); // Add $pendpage to the pendpage array (in any case) - fprintf(STDERR, "IMPORTANT: Pendadd: %d\n", $pendpage->status); + // fprintf(STDERR, "IMPORTANT: Pendadd: %d\n", $pendpage->status); $this->pendpage_add($pendpage); } @@ -631,14 +631,18 @@ class Sac_a_push { foreach ($this->socks as $k => $sock) { $id = intval($sock); if (isset($this->s2u[$id])) { - if ($this->s2u[$id]->the_end) { - if ($this->s2u[$id]->rd_socket_get() != NULL) { - $this->s2u[$id]->rd_socket_set(NULL); + $user = $this->s2u[$id]; + if ($user->the_end) { + if (($user->rd_toflush == FALSE && $user->rd_step == $user->step) + || $user->rd_endtime_is_expired($this->curtime)) { + if ($user->rd_socket_get() != NULL) { + $user->rd_socket_set(NULL); + } + unset($this->socks[$id]); + unset($this->s2u[$id]); + fclose($sock); + // printf("CLOSE ON GARBAGE MANAGER\n"); } - unset($this->socks[$id]); - unset($this->s2u[$id]); - fclose($sock); - printf("CLOSE ON GARBAGE MANAGER\n"); } } } @@ -684,10 +688,14 @@ class Sac_a_push { $this->main_loop = TRUE; + $lastime = 0; + $dump_users = TRUE; while ($this->main_loop) { $this->app->sess_cur_set(FALSE); $this->curtime = time(); - fprintf(STDERR, "IN LOOP: Current opened: %d pending_pages: %d\n", count($this->socks), count($this->pending_pages)); + if ($lastime != ($this->curtime >> 2)) { + fprintf(STDERR, "\nIN LOOP: Current opened: %d pending_pages: %d\n", count($this->socks), count($this->pending_pages)); + } /* Prepare the read array */ /* // when we manage it ... */ @@ -714,10 +722,13 @@ class Sac_a_push { $num_changed_sockets = @stream_select($read, $write, $except, 0, 500000); if ($num_changed_sockets == 0) { - printf(" no data in 5 secs, splash [%d]\n", $G_with_splash); + // printf(" no data in 5 secs, splash [%d]\n", $G_with_splash); + ; } else if ($num_changed_sockets > 0) { - printf("num sock %d num_of_socket: %d\n", $num_changed_sockets, count($read)); + if ($lastime != ($this->curtime >> 2)) { + printf("num sock %d num_of_socket: %d\n", $num_changed_sockets, count($read)); + } if ($this->debug > 1) { print_r($read); } @@ -731,7 +742,7 @@ class Sac_a_push { continue; } if ($sock === $this->list_web) { - printf("NUOVA CONNEX\n"); + // printf("NUOVA CONNEX\n"); if (($new_unix = stream_socket_accept($this->list_web)) == FALSE) { printf("SOCKET_ACCEPT FAILED\n"); continue; @@ -744,22 +755,32 @@ class Sac_a_push { $rest = 0; $cont = ""; if (($new_socket = ancillary_getstream($new_unix, $stream_info)) !== FALSE) { - printf("NEW_SOCKET: %d\n", intval($new_socket)); + // printf("NEW_SOCKET: %d\n", intval($new_socket)); stream_set_blocking($new_socket, $this->blocking_mode); // Set the stream to non-blocking - printf("RECEIVED HEADER:\n%s", $stream_info); + // error_log(sprintf("RECEIVED HEADER:\n%s", $stream_info)); if (($path = spu_process_info($stream_info, $method, $header, $get, $post, $cookie, $rest, $cont)) == FALSE) { fprintf(STDERR, "TODO: fix wrong header management\n"); } - $addr_full = stream_socket_get_name($new_socket, TRUE); + + // We try to get real IP from header (passed by proxy) and then fallback to direct connection IP + // error_log(sprintf("addr: [%s]", $addr)); + // error_log(sprintf("X-Real-Ip: [%s]", array_key_exists('X-Real-Ip', $header) ? $header['X-Real-Ip'] : "Not exists")); + if (array_key_exists('X-Real-Ip', $header)) { + $addr = $header['X-Real-Ip']; + } + else { + $addr = addrtoipv4(stream_socket_get_name($new_socket, TRUE)); + } + // FOR TEST $header['X-Forwarded-For'] = '154.155.22.33'; - $addr = $this->pproxy_realip($header, addrtoipv4($addr_full)); + $addr = $this->pproxy_realip($header, $addr); - printf("PATH: [%s] [%s]\n", $path, print_r($header, TRUE)); + // printf("PATH: [%s] [%s]\n", $path, print_r($header, TRUE)); if ($method == "POST" && $rest > 0) { if (isset($header['Expect']) && $header['Expect'] == '100-continue') { - fprintf(STDERR, "\nPOSTA DE CHE\n\n"); + // fprintf(STDERR, "\nPOSTA DE CHE\n\n"); $this->pendpage_try_addcont($new_socket, 20, $method, $header, $get, $post, $cookie, $path, $addr, $rest, $cont); @@ -774,14 +795,14 @@ class Sac_a_push { $manage_page = TRUE; } - printf("number of sockets after %d\n", count($this->socks)); + // printf("number of sockets after %d\n", count($this->socks)); } else { printf("WARNING: ancillary_getstream failed\n"); } } else if ($sock === $this->list_cmd) { - printf("NUOVA DIRECT CONNEX\n"); + // printf("NUOVA DIRECT CONNEX\n"); if (($new_unix = stream_socket_accept($this->list_cmd)) == FALSE) { printf("SOCKET_ACCEPT FAILED\n"); continue; @@ -795,18 +816,19 @@ class Sac_a_push { if ($buf == FALSE || feof($sock)) { // close socket case if ($buf == FALSE) { - printf("INFO: read return false\n"); + // printf("INFO: read return false\n"); + ; } if ($sock === $this->list_web) { - printf("Arrivati %d bytes da list\n", mb_strlen($buf, "ASCII")); + // printf("Arrivati %d bytes da list\n", mb_strlen($buf, "ASCII")); return(21); } else if ($sock === $this->list_cmd) { - printf("Arrivati %d bytes da list_cmd\n", mb_strlen($buf, "ASCII")); + // printf("Arrivati %d bytes da list_cmd\n", mb_strlen($buf, "ASCII")); return(23); } else if ($sock === $this->in || $sock === static::$cnt_slave) { - printf("Arrivati %d bytes da stdin\n", mb_strlen($buf, "ASCII")); + // printf("Arrivati %d bytes da stdin\n", mb_strlen($buf, "ASCII")); return(22); } else { @@ -824,7 +846,7 @@ class Sac_a_push { } } fclose($sock); - printf("CLOSE ON READ\n"); + // printf("CLOSE ON READ\n"); if ($this->debug > 1) { printf("post unset\n"); @@ -836,13 +858,15 @@ class Sac_a_push { print_r($read); } if ($sock === $this->list_web) { - printf("Arrivati %d bytes da list\n", mb_strlen($buf, "ASCII")); + // printf("Arrivati %d bytes da list\n", mb_strlen($buf, "ASCII")); + ; } else if ($sock === $this->list_cmd) { - printf("Arrivati %d bytes da list_cmd\n", mb_strlen($buf, "ASCII")); + // printf("Arrivati %d bytes da list_cmd\n", mb_strlen($buf, "ASCII")); + ; } else if ($sock === $this->in || $sock === static::$cnt_slave) { - printf("Arrivati %d bytes da stdin\n", mb_strlen($buf, "ASCII")); + // printf("Arrivati %d bytes da stdin\n", mb_strlen($buf, "ASCII")); $line = trim($buf); if ($line == "reload") { require("$DOCUMENT_ROOT/Etc/".BRISK_CONF); @@ -855,6 +879,9 @@ class Sac_a_push { } global_dump(); } + else if ($line == "dump") { + $dump_users = TRUE; + } else if ($line == "shutdown" || $line == "sd") { if ($this->app->dump_data()) { return(0); @@ -866,7 +893,7 @@ class Sac_a_push { } else { // data arrived from not special socket $key = array_search("$sock", $this->socks); - fprintf(STDERR, "Arrivati %d bytes dalla socket n. %d\n", mb_strlen($buf, "ASCII"), $key); + // fprintf(STDERR, "Arrivati %d bytes dalla socket n. %d\n", mb_strlen($buf, "ASCII"), $key); if (isset($this->s2p[$id])) { $this->s2p[$id]->rest -= mb_strlen($buf, "ASCII"); $this->s2p[$id]->cont .= $buf; @@ -886,6 +913,7 @@ class Sac_a_push { } if ($manage_page == TRUE) { + /* printf("M: %s\nHEADER:\n", $method); print_r($header); printf("GET:\n"); @@ -894,6 +922,7 @@ class Sac_a_push { print_r($post); printf("COOKIE:\n"); print_r($cookie); + */ $header_out = array(); // TODO: MOVE DOWN request_mgr to factorize new_sockets and POST closed @@ -950,7 +979,9 @@ class Sac_a_push { if ($response == "") { $content = ""; $user->stream_main($content, $get, $post, $cookie); - printf("[%s] [%d] [%d]\n", $user->name, $user->lacc, $this->curtime); + if ($dump_users) { + printf("[%s] [%d] [%d]\n", $user->name, $user->lacc, $this->curtime); + } if ($do_ping && $user->ping_req == FALSE) { $content .= $user->stream_keepalive(TRUE); $user->ping_req = TRUE; @@ -993,14 +1024,16 @@ class Sac_a_push { $clo_l = mb_strlen($clo, "ASCII"); @fwrite($sock, $clo, $clo_l); fclose($sock); - printf("CLOSE ON LOOP\n"); + // printf("CLOSE ON LOOP\n"); } } // if (isset($this->s2u[$id]... } // foreach ($this->socks... - printf("\n"); + $dump_users = FALSE; + printf("#"); if (defined('CURL_DE_SAC_VERS')) { $this->app->cds->process(); } + $lastime = ($this->curtime >> 2); } // while (... } // function run(... @@ -1033,7 +1066,7 @@ class Sac_a_push { return cmd_return(401, 'malformed cmd'); } $idx = -1; - if (($user = $this->app->get_user($cmd['sess'], &$idx)) == FALSE) + if (($user = $this->app->get_user($cmd['sess'], $idx)) == FALSE) return cmd_return(402, 'user not found'); if (($user->flags & USER_FLAG_TY_ADMIN) == 0x00)