X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fspush%2Fbrisk-spush.php;h=548d885c2fd67af75e724b58ab112d145a17b35c;hb=cd7f0c894589ddf7a3d3b2deaedfc055fbb42dd5;hp=a811a2902f3283c58aa616cac8380084a405a4ca;hpb=8c1df4ebf55f715144a422cdb4be7eee48f1b5d2;p=brisk.git

diff --git a/web/spush/brisk-spush.php b/web/spush/brisk-spush.php
index a811a29..548d885 100755
--- a/web/spush/brisk-spush.php
+++ b/web/spush/brisk-spush.php
@@ -23,348 +23,67 @@
  *
  * TODO
  *
- *   - partial write for normal page management
- *   - log legal address fix
- *   - from room to table
- *   - from table to room
- *   - fwrite other issues
+ *   - BUG: lurker are logged out (and remain a pending socket opened (look the spush log)
+ *   - BUG: logout failed
+ *   - BUG: fast loop on stream index_rd_ifra page
+ *
+ *   - centralize all '<script ...' incapsulation to allow multiple transport system.
+ *
  *   - manage and test cross forwarder between table and room
+ *   TEST - garbage management
+ *   - log_legal address fix
  *   - setcookie (for tables only)
- *   - keepalive management
- *   - chunked
+ *   - 404 wrong page management
  *
  *   DONE/FROZEN - problema con getpeer (HOSTADDR)
  *
+ *   DONE - app level keep-alive
+ *   DONE - index_wr other issues
+ *   DONE - from room to table
+ *   DONE - from table to room
+ *   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
  *   DONE - fwrite failed error management (select, buffer where store unsent data, and fwrite check and retry)
- *   ABRT - index_wr.php::reload - reload is js-only function
  *   DONE - bug: after restart index_rd.php receive from prev clients a lot of req
  *   DONE - index_wr.php::chat
  *   DONE - index_wr.php::exit
  *   DONE - index_rd.php porting
  *   DONE - generic var management from internet
  *   DONE - index.php auth part
+ *   ABRT - index_wr.php::reload - reload is js-only function
+ *   ABRT - keepalive management - not interesting for our purposes
  */
 
 $G_base = "../";
 
-require_once("./sac-a-push.phh");
+require_once($G_base."Obj/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");
 require_once($G_base."index.php");
 require_once($G_base."index_wr.php");
-require_once($G_base."index_rd_ifra.php");
 require_once($G_base."briskin5/Obj/briskin5.phh");
+require_once($G_base."briskin5/index.php");
+require_once($G_base."briskin5/index_wr.php");
 
-define('SITE_PREFIX', '/brisk/');
-
-function headers_render($header)
-{
-    
-    $s = "";
-    $s .= "HTTP/1.1 200 OK\r\n";
-    if (!isset($header['Date']))
-        $s .= sprintf("Date: %s\r\n", date(DATE_RFC822));
-    if (!isset($header['Connection']))
-        $s .= "Connection: close\r\n";
-    if (!isset($header['Content-Type']))
-        $s .= "Content-Type: text/html\r\n";
-    foreach($header as $key => $value) {
-        $s .= sprintf("%s: %s\r\n", $key, $value);
-    }
-    $s .= "Mop: was/here\r\n";
-    $s .= "\r\n";
-
-    return ($s);
-}
-
-/*
- *  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()
-{
-  log_rd2("SHUTTA [".connection_status()."] !");
-}
-
-register_shutdown_function('shutta');
-
-/*
- *  MAIN
- */
-$shutdown = FALSE;
 
 function main()
 {
-    GLOBAL $G_headers;
-    GLOBAL $shutdown;
-    $main_loop = TRUE;
-
-    /*
-     *  INIT
-     */
-
-    $FILE_SOCKET = "/tmp/brisk.sock";
-    $UNIX_SOCKET = "unix://$FILE_SOCKET";
-    $debug = 0;
-    $fixed_fd = 2;
-    $socks = array();
-
-    $blocking_mode = 0; // 0 for non-blocking
-
     if (($room = Room::create()) == FALSE) {
-        log_crit("load_data failed");
-        return FALSE;
+        log_crit("room::create failed");
+        exit(1);
     }
 
-    $s2u  = array();
-    $pages_flush = array();
-
-    $rndstr = "";
-    for ($i = 0 ; $i < 4096 ; $i++) {
-        $rndstr .= chr(mt_rand(65, 90));
-    }
-
-    if (file_exists($FILE_SOCKET)) {
-        unlink($FILE_SOCKET);
-    }
-    
-    $old_umask = umask(0);
-    if (($list = stream_socket_server($UNIX_SOCKET, $err, $errs)) === FALSE) {
-        exit(11);
-    }
-    umask($old_umask);
-
-    if (($in = fopen("php://stdin", "r")) === FALSE) {
-        exit(11);
+    if (($s_a_p = Sac_a_push::create($room, "/tmp/brisk.sock", 0, 0)) === FALSE) {
+        exit(1);
     }
 
-    stream_set_blocking($list, $blocking_mode); # Set the stream to non-blocking
-
-    while ($main_loop) {
-        $curtime = time();
-        printf("IN LOOP: Current opened: %d  pages_flush: %d\n", count($socks), count($pages_flush));
-
-        /* Prepare the read array */
-        if ($shutdown) 
-            $read   = array_merge(array("$in" => $in), $socks);
-        else
-            $read   = array_merge(array("$list" => $list, "$in" => $in), $socks);
-
-        if ($debug > 1) {
-            printf("PRE_SELECT\n");
-            print_r($read);
-        }
-        $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) {
-                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;
-                }
-                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);
+    $s_a_p->run();
 
-                            if ($pgflush->try_flush($curtime) == FALSE) {
-                                // Add $pgflush to the pgflush array
-                                array_push($pages_flush, $pgflush);
-                            }
-
-                            break;
-                        case SITE_PREFIX."index_wr.php":
-                            $header_out = array();
-                            $addr = "";
-                            // $ret = socket_getpeername($new_socket, $addr);
-                            printf("RET: %s\n", $addr);
-                            // exit(123);
-                            ob_start();
-                            index_wr_main($room, $addr, $get, $post, $cookie);
-                            $content = ob_get_contents();
-                            ob_end_clean();
-                            
-                            // printf("OUT: [%s]\n", $G_content);
-                            fwrite($new_socket, headers_render($header_out).$content);
-                            fclose($new_socket);
-                            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;
-                        }
-                    }
-                    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));
-                        }
-                        else if ($sock === $in) {
-                            printf("Arrivati %d bytes da stdin\n", strlen($buf));
-                        }
-                        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);
-                            }
-                            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);
-                        }
-                        if ($sock === $list) {
-                            printf("Arrivati %d bytes da list\n", strlen($buf));
-                        }
-                        else if ($sock === $in) {
-                            printf("Arrivati %d bytes da stdin\n", strlen($buf));
-                        }
-                        else {
-                            $key = array_search("$sock", $socks);
-                            printf("Arrivati %d bytes dalla socket n. %d\n", strlen($buf), $key);
-                        }
-                    }
-                }
-            }
-        }
-
-
-        foreach ($pages_flush as $k => $pgflush) {
-            if ($pgflush->try_flush($curtime) == TRUE) {
-                unset($pages_flush[$k]);
-            }
-        }
-
-        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);
-
-                if ($body == "" && $user->rd_kalive_is_expired($curtime)) {
-                    $body = index_rd_ifra_keepalive($user);
-                }
-
-                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);
-                }
-
-                // 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);
 }