pull of unix socket to interact with apache2

[brisk.git] / web / spush / brisk-spush.php

diff --git a/web/spush/brisk-spush.php b/web/spush/brisk-spush.php
index 7b1ddc0..00d3e64 100755 (executable)
--- a/web/spush/brisk-spush.php
+++ b/web/spush/brisk-spush.php
@@ -28,45 +28,51 @@ $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($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."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");
 require_once($G_base."briskin5/index.php");
 require_once($G_base."briskin5/index_wr.php");
 
+if (FALSE) {
+function my_e($number, $msg, $file, $line, $vars) {
+    print_r(debug_backtrace());
+    die();
+}
 
-function main($argv)
+function my_for_fatal()
 {
-    GLOBAL $G_ban_list, $G_black_list;
-
-    // create cds
-    $cds = new Curl_de_sac();
+    // $error = error_get_last();
+    // if ( $error["type"] == E_ERROR ) {
+        print_r(debug_backtrace());
+        die();
+        // }
+    //   log_error( $error["type"], $error["message"], $error["file"], $error["line"] );
+}
 
-    // create tor_chk_cls
-    $tor_chk_cls = new tor_chk_cmd_cls();
+register_shutdown_function( "my_for_fatal" );
+set_error_handler('my_e');
+}
 
-    // 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);
-    }
+function main($argv)
+{
+    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)) == FALSE) {
+        if (($brisk = Brisk::create(LEGAL_PATH."/brisk-crystal.data", $G_ban_list, $G_black_list, $G_cloud_smasher)) == FALSE) {
             log_crit("Brisk::create failed");
             $ret = 1;
             break;
         }
 
-        if (($s_a_p = Sac_a_push::create($brisk, USOCK_PATH, 0, 0, $argv)) === FALSE) {
+        if (($s_a_p = Sac_a_push::create($brisk, USOCK_PATH_PFX, 0, 0, $G_provider_proxy, $argv)) === FALSE) {
             $ret = 2;
             break;
         }