X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fspush%2Fbrisk-spush.php;h=a48aa1fe34740ebc6c222ef827ecbbc56448ed64;hb=fce0ad98358c7884408699613ad33c92851d45b4;hp=28088f38398d43a13a85f8901bcb665b151664c0;hpb=a47ad701b5adc48193ebf177ae6978aed8c92650;p=brisk.git diff --git a/web/spush/brisk-spush.php b/web/spush/brisk-spush.php index 28088f3..a48aa1f 100755 --- a/web/spush/brisk-spush.php +++ b/web/spush/brisk-spush.php @@ -23,6 +23,7 @@ * * TODO * + * * - BUG: logout failed * - BUG: fast loop on stream index_rd_ifra page * @@ -30,14 +31,14 @@ * - log_legal address fix * - from room to table * - from table to room - * - fwrite other issues + * - index_wr other issues * - manage and test cross forwarder between table and room * - setcookie (for tables only) * - keepalive management - * - chunked * * DONE/FROZEN - problema con getpeer (HOSTADDR) * + * DONE - chunked * DONE - bug: read from a not resource handle (already closed because a new socket substitute it) * DONE - partial write for normal page management * DONE - index_rd_ifra: last_clean issue @@ -55,6 +56,7 @@ $G_base = "../"; require_once("./sac-a-push.phh"); require_once("./brisk-spush.phh"); +require_once($G_base."Obj/user.phh"); require_once($G_base."Obj/brisk.phh"); require_once($G_base."Obj/auth.phh"); // require_once("../Obj/proxyscan.phh"); @@ -65,7 +67,7 @@ require_once($G_base."briskin5/Obj/briskin5.phh"); define('SITE_PREFIX', '/brisk/'); -function headers_render($header) +function headers_render($header, $len) { $s = ""; @@ -79,7 +81,15 @@ function headers_render($header) foreach($header as $key => $value) { $s .= sprintf("%s: %s\r\n", $key, $value); } - $s .= "Mop: was/here\r\n"; + if ($len == -1) { + $s .= "Cache-Control: no-cache, must-revalidate\r\n"; + $s .= "Expires: Mon, 26 Jul 1997 05:00:00 GMT\r\n"; + $s .= "Content-Encoding: chunked\r\n"; + $s .= "Transfer-Encoding: chunked\r\n"; + } + else if ($len > 0) { + $s .= sprintf("Content-Length: %d\r\n", $len); + } $s .= "\r\n"; return ($s); @@ -89,7 +99,6 @@ function headers_render($header) * Caching system using ob php system to cache old style pages * to a var and than send it with more calm */ -$G_headers = ""; function shutta() { @@ -101,274 +110,310 @@ register_shutdown_function('shutta'); /* * MAIN */ -$shutdown = FALSE; -function main() +function chunked_content($content) { - GLOBAL $G_headers; - GLOBAL $shutdown; - $main_loop = TRUE; + $content_l = mb_strlen($content, "ASCII"); + + return (sprintf("%X\r\n%s\r\n", $content_l, $content)); +} - /* - * INIT - */ +function chunked_fini() +{ + return sprintf("0\r\n"); +} - $FILE_SOCKET = "/tmp/brisk.sock"; - $UNIX_SOCKET = "unix://$FILE_SOCKET"; - $debug = 0; - $fixed_fd = 2; - $socks = array(); +class Sac_a_push { + static $fixed_fd = 2; + + var $file_socket; + var $unix_socket; + var $socks; + var $s2u; + var $pages_flush; - $blocking_mode = 0; // 0 for non-blocking + var $list; + var $in; - if (($room = Room::create()) == FALSE) { - log_crit("load_data failed"); - return FALSE; - } + var $debug; + var $blocking_mode; - $s2u = array(); - $pages_flush = array(); + var $room; + var $bin5; - $rndstr = ""; - for ($i = 0 ; $i < 4096 ; $i++) { - $rndstr .= chr(mt_rand(65, 90)); - } + var $curtime; - if (file_exists($FILE_SOCKET)) { - unlink($FILE_SOCKET); + var $rndstr; + var $main_loop; + + function Sac_a_push() + { } + + // Sac_a_push::create("/tmp/brisk.sock", 0, 0 + + static function create(&$room, $sockname, $debug, $blocking_mode) + { + $thiz = new Sac_a_push(); + + $thiz->room = $room; + $thiz->file_socket = $sockname; + $thiz->unix_socket = "unix://$sockname"; + $thiz->debug = $debug; + $thiz->socks = array(); + $thiz->s2u = array(); + $thiz->pages_flush = array(); + + $thiz->blocking_mode = 0; // 0 for non-blocking + + $thiz->rndstr = ""; + for ($i = 0 ; $i < 4096 ; $i++) { + $thiz->rndstr .= chr(mt_rand(65, 90)); + } + + if (file_exists($thiz->file_socket)) { + unlink($thiz->file_socket); + } - $old_umask = umask(0); - if (($list = stream_socket_server($UNIX_SOCKET, $err, $errs)) === FALSE) { - exit(11); + $old_umask = umask(0); + if (($thiz->list = stream_socket_server($thiz->unix_socket, $err, $errs)) === FALSE) { + return (FALSE); + } + umask($old_umask); + stream_set_blocking($thiz->list, $thiz->blocking_mode); # Set the stream to non-blocking + + if (($thiz->in = fopen("php://stdin", "r")) === FALSE) { + return(FALSE); + } + + $thiz->main_loop = FALSE; + + return ($thiz); + } + + function socks_set($sock, $user) + { + $id = intval($sock); + + $this->s2u[$id] = $user; + $this->socks[$id] = $sock; } - umask($old_umask); - if (($in = fopen("php://stdin", "r")) === FALSE) { - exit(11); + function socks_unset($sock) + { + $id = intval($sock); + + unset($this->s2u[$id]); + unset($this->socks[$id]); } - stream_set_blocking($list, $blocking_mode); # Set the stream to non-blocking + function pgflush_try_add(&$new_socket, $tout, $header_out, $content) + { + $pgflush = new PageFlush($new_socket, $this->curtime, $tout, $header_out, $content); - while ($main_loop) { - $curtime = time(); - printf("IN LOOP: Current opened: %d pages_flush: %d\n", count($socks), count($pages_flush)); + if ($pgflush->try_flush($this->curtime) == FALSE) { + // Add $pgflush to the pgflush array + $this->pgflush_add($pgflush); + } + } - /* Prepare the read array */ - if ($shutdown) - $read = array_merge(array("$in" => $in), $socks); - else - $read = array_merge(array("$list" => $list, "$in" => $in), $socks); + function pgflush_add($pgflush) + { + array_push($this->pages_flush, $pgflush); + } - if ($debug > 1) { - printf("PRE_SELECT\n"); - print_r($read); + function run() + { + if ($this->main_loop) { + return (FALSE); } - $write = NULL; - $except = NULL; - $num_changed_sockets = stream_select($read, $write, $except, 0, 250000); - if ($num_changed_sockets === FALSE) { - printf("No data in 5 secs"); - } - else if ($num_changed_sockets > 0) { - printf("num sock %d num_of_socket: %d\n", $num_changed_sockets, count($read)); - if ($debug > 1) { + $this->main_loop = TRUE; + + while ($this->main_loop) { + $this->curtime = time(); + printf("IN LOOP: Current opened: %d pages_flush: %d - ", count($this->socks), count($this->pages_flush)); + + /* Prepare the read array */ + /* // when we manage it ... */ + /* if ($shutdown) */ + /* $read = array_merge(array("$in" => $in), $socks); */ + /* else */ + $read = array_merge(array(intval($this->list) => $this->list, intval($this->in) => $this->in), + $this->socks); + + if ($this->debug > 1) { + printf("PRE_SELECT\n"); print_r($read); } - /* At least at one of the sockets something interesting happened */ - foreach ($read as $i => $sock) { - /* is_resource check is required because there is the possibility that - during new request an old connection is closed */ - if (!is_resource($sock)) { - continue; + $write = NULL; + $except = NULL; + $num_changed_sockets = stream_select($read, $write, $except, 0, 250000); + + if ($num_changed_sockets == 0) { + printf(" no data in 5 secs "); + } + else if ($num_changed_sockets > 0) { + printf("num sock %d num_of_socket: %d\n", $num_changed_sockets, count($read)); + if ($this->debug > 1) { + print_r($read); } - if ($sock === $list) { - printf("NUOVA CONNEX\n"); - $new_unix = stream_socket_accept($list); - $stream_info = ""; - $method = ""; - $get = array(); - $post = array(); - $cookie = array(); - if (($new_socket = ancillary_getstream($new_unix, $stream_info)) !== FALSE) { - stream_set_blocking($new_socket, $blocking_mode); // Set the stream to non-blocking - printf("RECEIVED HEADER:\n%s", $stream_info); - $path = spu_process_info($stream_info, $method, $header, $get, $post, $cookie); - printf("PATH: [%s]\n", $path); - printf("M: %s\nHEADER:\n", $method); - print_r($header); - printf("GET:\n"); - print_r($get); - printf("POST:\n"); - print_r($post); - printf("COOKIE:\n"); - print_r($cookie); - - $addr = stream_socket_get_name($new_socket, TRUE); - - switch ($path) { - case SITE_PREFIX: - case SITE_PREFIX."index.php": - $header_out = array(); - ob_start(); - index_main($room, $header_out, $addr, $get, $post, $cookie); - $content = ob_get_contents(); - ob_end_clean(); - - $pgflush = new PageFlush($new_socket, $curtime, 20, $header_out, $content); - - if ($pgflush->try_flush($curtime) == FALSE) { - // Add $pgflush to the pgflush array - array_push($pages_flush, $pgflush); - } - - break; - case SITE_PREFIX."index_wr.php": + /* At least at one of the sockets something interesting happened */ + foreach ($read as $i => $sock) { + /* is_resource check is required because there is the possibility that + during new request an old connection is closed */ + if (!is_resource($sock)) { + continue; + } + if ($sock === $this->list) { + printf("NUOVA CONNEX\n"); + $new_unix = stream_socket_accept($this->list); + $stream_info = ""; + $method = ""; + $get = array(); + $post = array(); + $cookie = array(); + if (($new_socket = ancillary_getstream($new_unix, $stream_info)) !== FALSE) { + 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); + $path = spu_process_info($stream_info, $method, $header, $get, $post, $cookie); + printf("PATH: [%s]\n", $path); + printf("M: %s\nHEADER:\n", $method); + print_r($header); + printf("GET:\n"); + print_r($get); + printf("POST:\n"); + print_r($post); + printf("COOKIE:\n"); + print_r($cookie); + + $addr = stream_socket_get_name($new_socket, TRUE); $header_out = array(); - ob_start(); - index_wr_main($room, $addr, $get, $post, $cookie); - $content = ob_get_contents(); - ob_end_clean(); - - $pgflush = new PageFlush($new_socket, $curtime, 20, $header_out, $content); - - if ($pgflush->try_flush($curtime) == FALSE) { - // Add $pgflush to the pgflush array - array_push($pages_flush, $pgflush); - } - break; - case SITE_PREFIX."index_rd_ifra.php": - do { - $header_out = array(); - if (!isset($cookie['sess']) - || (($user = $room->get_user($cookie['sess'], $idx)) == FALSE)) { - $body = index_rd_ifra_fini(TRUE); - fwrite($new_socket, headers_render($header_out).$body); - fflush($new_socket); - fclose($new_socket); - break; - } - // close a previous opened index_read_ifra socket, if exists - if (($prev = $user->rd_socket_get()) != NULL) { - unset($s2u[intval($user->rd_socket_get())]); - unset($socks[intval($user->rd_socket_get())]); - fclose($user->rd_socket_get()); - printf("CLOSE AND OPEN AGAIN ON IFRA2\n"); - $user->rd_socket_set(NULL); - } - - $body = ""; - index_rd_ifra_init($room, $user, $header_out, $body, $get, $post, $cookie); - fwrite($new_socket, headers_render($header_out).$body); - fflush($new_socket); - - $s2u[intval($new_socket)] = $idx; - $socks[intval($new_socket)] = $new_socket; - $user->rd_socket_set($new_socket); - } while (FALSE); - break; + $this->room->request_mgr($this, $header_out, $new_socket, $path, $addr, $get, $post, $cookie); + printf("number of sockets after %d\n", count($this->socks)); + } + else { + printf("WARNING: ancillary_getstream failed\n"); } } else { - printf("WARNING: ancillary_getstream failed\n"); - } - } - else { - if (($buf = fread($sock, 512)) === FALSE) { - printf("error read\n"); - exit(123); - } - else if (strlen($buf) === 0) { - if ($sock === $list) { - printf("Arrivati %d bytes da list\n", strlen($buf)); + if (($buf = fread($sock, 512)) === FALSE) { + printf("error read\n"); + exit(123); } - else if ($sock === $in) { - printf("Arrivati %d bytes da stdin\n", strlen($buf)); + else if (strlen($buf) === 0) { + if ($sock === $this->list) { + printf("Arrivati %d bytes da list\n", strlen($buf)); + } + else if ($sock === $this->in) { + printf("Arrivati %d bytes da stdin\n", strlen($buf)); + } + else { + // $user_a[$s2u[intval($sock)]]->disable(); + if ($this->s2u[intval($sock)]->rd_socket_get() != NULL) { + $this->s2u[intval($sock)]->rd_socket_set(NULL); + } + unset($this->socks[intval($sock)]); + unset($this->s2u[intval($sock)]); + fclose($sock); + printf("CLOSE ON READ\n"); + } + if ($this->debug > 1) { + printf("post unset\n"); + print_r($this->socks); + } } else { - // $user_a[$s2u[intval($sock)]]->disable(); - if ($room->user[$s2u[intval($sock)]]->rd_socket_get() != NULL) { - $room->user[$s2u[intval($sock)]]->rd_socket_set(NULL); + if ($debug > 1) { + print_r($read); + } + if ($sock === $this->list) { + printf("Arrivati %d bytes da list\n", strlen($buf)); + } + else if ($sock === $this->in) { + printf("Arrivati %d bytes da stdin\n", strlen($buf)); + } + else { + $key = array_search("$sock", $this->socks); + printf("Arrivati %d bytes dalla socket n. %d\n", strlen($buf), $key); } - unset($socks[intval($sock)]); - unset($s2u[intval($sock)]); - fclose($sock); - printf("CLOSE ON READ\n"); - } - if ($debug > 1) { - printf("post unset\n"); - print_r($socks); } } - else { - if ($debug > 1) { - print_r($read); + } + } + + + /* manage unfinished pages */ + foreach ($this->pages_flush as $k => $pgflush) { + if ($pgflush->try_flush($this->curtime) == TRUE) { + unset($this->pages_flush[$k]); + } + } + + /* manage open streaming */ + foreach ($this->socks as $k => $sock) { + if (isset($this->s2u[intval($sock)])) { + $user = $this->s2u[intval($sock)]; + $response = $user->rd_cache_get(); + if ($response == "") { + $content = ""; + $user->stream_main($content, $get, $post, $cookie); + + if ($content == "" && $user->rd_kalive_is_expired($this->curtime)) { + $content = $user->stream_keepalive(); } - if ($sock === $list) { - printf("Arrivati %d bytes da list\n", strlen($buf)); + if ($content != "") { + $response = chunked_content($content); } - else if ($sock === $in) { - printf("Arrivati %d bytes da stdin\n", strlen($buf)); + } + + if ($response != "") { + echo "SPIA: [".substr($response, 0, 60)."...]\n"; + $response_l = mb_strlen($response, "ASCII"); + $wret = @fwrite($sock, $response); + if ($wret < $response_l) { + printf("TROUBLE WITH FWRITE: %d\n", $wret); + $user->rd_cache_set(mb_substr($response, $wret, $response_l - $wret, "ASCII")); } else { - $key = array_search("$sock", $socks); - printf("Arrivati %d bytes dalla socket n. %d\n", strlen($buf), $key); + $user->rd_cache_set(""); + } + fflush($sock); + $user->rd_kalive_reset($this->curtime); + } + + // close socket after a while to prevent client memory consumption + if ($user->rd_endtime_is_expired($this->curtime)) { + if ($this->s2u[intval($sock)]->rd_socket_get() != NULL) { + $this->s2u[intval($sock)]->rd_socket_set(NULL); } + unset($this->socks[intval($sock)]); + unset($this->s2u[intval($sock)]); + fclose($sock); + printf("CLOSE ON LOOP\n"); } } - } - } - - - foreach ($pages_flush as $k => $pgflush) { - if ($pgflush->try_flush($curtime) == TRUE) { - unset($pages_flush[$k]); - } - } + } // foreach ($this->socks... + printf("\n"); + } // while (... + } // function run(... +} - foreach ($socks as $k => $sock) { - if (isset($s2u[intval($sock)])) { - $user = $room->user[$s2u[intval($sock)]]; - $body = $user->rd_cache_get(); - if ($body == "") - index_rd_ifra_main($room, $user, $body); +function main() +{ + if (($room = Room::create()) == FALSE) { + log_crit("room::create failed"); + exit(1); + } - if ($body == "" && $user->rd_kalive_is_expired($curtime)) { - $body = index_rd_ifra_keepalive($user); - } + if (($s_a_p = Sac_a_push::create($room, "/tmp/brisk.sock", 0, 0)) === FALSE) { + exit(1); + } - if ($body != "") { - echo "SPIA: [".substr($body, 0, 60)."...]\n"; - $body_l = mb_strlen($body, "ASCII"); - $ret = @fwrite($sock, $body); - if ($ret < $body_l) { - printf("TROUBLE WITH FWRITE: %d\n", $ret); - $user->rd_cache_set(mb_substr($body, $ret, $body_l - $ret, "ASCII")); - } - else { - $user->rd_cache_set(""); - } - fflush($sock); - $user->rd_kalive_reset($curtime); - } + $s_a_p->run(); - // close socket after a while to prevent client memory consumption - if ($user->rd_endtime_is_expired($curtime)) { - // $user_a[$s2u[intval($sock)]]->disable(); - if ($room->user[$s2u[intval($sock)]]->rd_socket_get() != NULL) { - $room->user[$s2u[intval($sock)]]->rd_socket_set(NULL); - } - unset($socks[intval($sock)]); - unset($s2u[intval($sock)]); - fclose($sock); - printf("CLOSE ON LOOP\n"); - } - } - } - } - exit(0); }