X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fspush%2Fbrisk-spush.php;h=22def38e80a75ceb36e22e17e45f34dc6c2d0a75;hb=c9cbae97b192a003007a9d7f655473c266ca49d8;hp=8e82ebefd61f408d06e93d316e709c83e8aff17c;hpb=6c008efb122fbca6618fc14d6711729965cf8483;p=brisk.git

diff --git a/web/spush/brisk-spush.php b/web/spush/brisk-spush.php
index 8e82ebe..22def38 100755
--- a/web/spush/brisk-spush.php
+++ b/web/spush/brisk-spush.php
@@ -21,42 +21,6 @@
  * not, write to the Free Software Foundation, Inc, 59 Temple Place -
  * Suite 330, Boston, MA 02111-1307, USA.
  *
- * TODO
- *
- *   EXPR - DNS access
- *   - configuration file management
- *   - centralize all '<script ...' incapsulation to allow multiple transport system.
- *
- *   - manage and test cross forwarder between table and room
- *   - log_legal address fix
- *   - setcookie (for tables only and persist prefs)
- *   - 404 wrong page management
- *
- *   TEST - unneeded garbage_time.expired access
- *   TEST - BUG: fast loop on stream index_rd_ifra page (js watchdog start without timeout corrupt counts)
- *   TEST - BUG: lurker are logged out (and remain a pending socket opened (look the spush log)
- *   TEST - BUG: logout failed (fixed with a garbage_collector wrapper at sac-a-push level
- *   TEST - garbage 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)
- *   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 = "../";
@@ -64,9 +28,12 @@ $G_base = "../";
 require_once($G_base."Obj/sac-a-push.phh");
 require_once("./brisk-spush.phh");
 require_once($G_base."Obj/user.phh");
+@include_once($G_base."Obj/curl-de-brisk.phh");
 require_once($G_base."Obj/brisk.phh");
 require_once($G_base."Obj/auth.phh");
-// require_once("../Obj/proxyscan.phh");
+require_once($G_base."Obj/zlibstream.phh");
+require_once($G_base."Obj/mail.phh");
+require_once($G_base."Obj/provider_proxy.phh");
 require_once($G_base."index.php");
 require_once($G_base."index_wr.php");
 require_once($G_base."briskin5/Obj/briskin5.phh");
@@ -74,21 +41,29 @@ require_once($G_base."briskin5/index.php");
 require_once($G_base."briskin5/index_wr.php");
 
 
-function main()
+function main($argv)
 {
-    if (($room = Room::create()) == FALSE) {
-        log_crit("room::create failed");
-        exit(1);
-    }
+    GLOBAL $G_ban_list, $G_black_list, $G_cloud_smasher, $G_provider_proxy;
+
+    pid_save();
+    do {
+        if (($brisk = Brisk::create(LEGAL_PATH."/brisk-crystal.data", $G_ban_list, $G_black_list, $G_cloud_smasher, $G_provider_proxy)) == FALSE) {
+            log_crit("Brisk::create failed");
+            $ret = 1;
+            break;
+        }
 
-    if (($s_a_p = Sac_a_push::create($room, "/tmp/brisk.sock", 0, 0)) === FALSE) {
-        exit(1);
-    }
+        if (($s_a_p = Sac_a_push::create($brisk, USOCK_PATH, 0, 0, $argv)) === FALSE) {
+            $ret = 2;
+            break;
+        }
 
-    $s_a_p->run();
+        $ret = $s_a_p->run();
+    } while (0);
 
-    exit(0);
+    pid_remove();
+    exit($ret);
 }
 
-main();
+main($argv);
 ?>