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

diff --git a/web/spush/brisk-spush.php b/web/spush/brisk-spush.php
index 548d885..7b1ddc0 100755
--- a/web/spush/brisk-spush.php
+++ b/web/spush/brisk-spush.php
@@ -21,39 +21,6 @@
  * not, write to the Free Software Foundation, Inc, 59 Temple Place -
  * Suite 330, Boston, MA 02111-1307, USA.
  *
- * TODO
- *
- *   - 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)
- *   - 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)
- *   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 = "../";
@@ -63,6 +30,9 @@ 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($G_base."Obj/zlibstream.phh");
+require_once($G_base."Obj/mail.phh");
+require_once($G_base."Obj/curl-de-brisk.phh");
 // require_once("../Obj/proxyscan.phh");
 require_once($G_base."index.php");
 require_once($G_base."index_wr.php");
@@ -71,21 +41,42 @@ 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;
+
+    // create cds
+    $cds = new Curl_de_sac();
+
+    // create tor_chk_cls
+    $tor_chk_cls = new tor_chk_cmd_cls();
 
-    if (($s_a_p = Sac_a_push::create($room, "/tmp/brisk.sock", 0, 0)) === FALSE) {
+    // registrer tor_chk_cls
+    printf("MAIN: Register 'tor_chk_cls'\n");
+    if (($cds->cmd_cls_register($tor_chk_cls)) == FALSE) {
+        fprintf(STDERR, "MAIN: 'tor_chk_cls' registration failed\n");
         exit(1);
     }
 
-    $s_a_p->run();
+    pid_save();
+    do {
+        if (($brisk = Brisk::create(LEGAL_PATH."/brisk-crystal.data", $G_ban_list, $G_black_list)) == FALSE) {
+            log_crit("Brisk::create failed");
+            $ret = 1;
+            break;
+        }
+
+        if (($s_a_p = Sac_a_push::create($brisk, USOCK_PATH, 0, 0, $argv)) === FALSE) {
+            $ret = 2;
+            break;
+        }
+
+        $ret = $s_a_p->run();
+    } while (0);
 
-    exit(0);
+    pid_remove();
+    exit($ret);
 }
 
-main();
+main($argv);
 ?>