X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fsac-a-push.phh;h=80db1f434f79b05b285245cfc14e15a94c50e116;hb=2a36c945e6c9107f400dfb24d57c682f1c7f49e2;hp=4e88985cb4dc1d4950216419b9cf103964511103;hpb=7bccbb21239ca3cecf2914e9b307ab1e1b1aa46e;p=brisk.git

diff --git a/web/Obj/sac-a-push.phh b/web/Obj/sac-a-push.phh
index 4e88985..80db1f4 100644
--- a/web/Obj/sac-a-push.phh
+++ b/web/Obj/sac-a-push.phh
@@ -40,7 +40,7 @@ function global_dump()
     GLOBAL $G_splash_h, $G_splash_idx, $G_splash_interval, $G_splash_timeout;
     GLOBAL $G_splash_w, $G_topbanner, $G_with_donors, $G_with_poll;
     GLOBAL $G_with_splash, $G_sidebanner, $G_sidebanner_idx;
-    GLOBAL $G_with_topbanner;
+    GLOBAL $G_with_topbanner, $G_selfreg_tout;
 
     fprintf(STDERR, "G_alarm_passwd = [%s]\n", print_r($G_alarm_passwd, TRUE));
     fprintf(STDERR, "G_ban_list = [%s]\n", print_r($G_ban_list, TRUE));
@@ -73,6 +73,10 @@ function global_dump()
     fprintf(STDERR, "G_sidebanner_idx = [%s]\n", print_r($G_sidebanner_idx, TRUE));
     fprintf(STDERR, "G_with_splash = [%s]\n", print_r($G_with_splash, TRUE));
     fprintf(STDERR, "G_with_topbanner = [%s]\n", print_r($G_with_topbanner, TRUE));
+    fprintf(STDERR, "G_selfreg_mask = [%x]\n", print_r($G_selfreg_mask, TRUE));
+
+    fprintf(STDERR, "G_selfreg_tout = [%s]\n", print_r($G_selfreg_tout, TRUE));
+
 }
 
 function pid_save()
@@ -156,6 +160,8 @@ function spu_process_info($stream_info, &$method, &$header, &$get, &$post, &$coo
                 printf("A COUNT: [%s] %d\n", $a[0], count($a));
                 for ($i = 0 ; $i < count($a) ; $i++) {
                     $b = explode('=', $a[$i]);
+                    if ($b[0] == "")
+                        continue;
                     $get[$b[0]] = urldecode($b[1]);
                 }
             }
@@ -399,6 +405,8 @@ class Sac_a_push {
     static $fixed_fd = 3;
     static $cnt_master = NULL;
     static $cnt_slave  = NULL;
+
+    var $provider_proxy; // list of provider/browser that offer proxy service
     
     var $file_socket;
     var $unix_socket;
@@ -451,11 +459,14 @@ class Sac_a_push {
         }
     }
 
-    static function create(&$app, $sockname, $debug, $blocking_mode, $argv)
+    static function create(&$app, $sockname, $debug, $blocking_mode, $provider_proxy, $argv)
     {        
         $thiz = new Sac_a_push();
         
         $thiz->app = $app;
+
+        $thiz->provider_proxy = ProviderProxy::create();
+
         $thiz->file_socket = $sockname;
         $thiz->unix_socket = "unix://$sockname";
         $thiz->direct_socket = "unix://${sockname}2";
@@ -515,6 +526,7 @@ class Sac_a_push {
         }
 
         $thiz->main_loop = FALSE;
+        $thiz->reload(TRUE, $provider_proxy);
 
         return ($thiz);
     }
@@ -603,7 +615,7 @@ class Sac_a_push {
         foreach ($this->socks as $k => $sock) {
             $id = intval($sock);
             if (isset($this->s2u[$id])) {
-                if ($this->s2u[$id]->sess == '') {
+                if ($this->s2u[$id]->the_end) {
                     if ($this->s2u[$id]->rd_socket_get() != NULL) {
                         $this->s2u[$id]->rd_socket_set(NULL);
                     }
@@ -614,13 +626,15 @@ class Sac_a_push {
                 }
             }
         }
+        $this->app->users_cleanup();
     }
 
     function run()
     {
         GLOBAL $DOCUMENT_ROOT, $HTTP_HOST;
 
-        GLOBAL $G_alarm_passwd, $G_ban_list, $G_black_list, $G_btrace_pref_sub, $G_dbauth;
+        GLOBAL $G_alarm_passwd, $G_ban_list, $G_black_list, $G_cloud_smasher, $G_provider_proxy;
+        GLOBAL $G_btrace_pref_sub, $G_dbauth;
         GLOBAL $G_dbpfx, $G_donors_all, $G_donors_cur, $G_is_local, $G_lang;
         GLOBAL $G_poll_entries, $G_poll_name, $G_poll_title, $G_proxy_white_list;
         GLOBAL $G_room_roadmap, $G_shutdown;
@@ -705,8 +719,11 @@ class Sac_a_push {
                                 == FALSE) {
                                 fprintf(STDERR, "TODO: fix wrong header management\n");
                             }
-                            $addr = stream_socket_get_name($new_socket, TRUE);
-                            printf("PATH: [%s]\n", $path);
+                            $addr_full = stream_socket_get_name($new_socket, TRUE);
+                            // FOR TEST $header['X-Forwarded-For'] = '154.155.22.33';
+                            $addr = $this->pproxy_realip($header, addrtoipv4($addr_full));
+
+                            printf("PATH: [%s] [%s]\n", $path, print_r($header, TRUE));
                             if ($method == "POST" && $rest > 0) {
                                 if (isset($header['Expect']) && $header['Expect'] == '100-continue') {
                                     fprintf(STDERR, "\nPOSTA DE CHE\n\n");
@@ -796,7 +813,9 @@ class Sac_a_push {
                                 $line = trim($buf);
                                 if ($line == "reload") {
                                     require("$DOCUMENT_ROOT/Etc/".BRISK_CONF);
-                                    $this->app->reload($G_ban_list, $G_black_list);
+                                    $this->reload(FALSE, $G_provider_proxy);
+                                    $this->app->reload(FALSE, $G_ban_list, $G_black_list,
+                                                       $G_cloud_smasher);
                                     global_dump();
                                 }
                                 else if ($line == "shutdown" || $line == "sd") {
@@ -848,6 +867,7 @@ class Sac_a_push {
                         if ($rret == FALSE) {
                             // FIXME: manage 404 !!!
                             printf("TODO: fix unknown page\n");
+                            fclose($new_socket);
                         }
                     }
                 }
@@ -874,6 +894,13 @@ class Sac_a_push {
                 $id = intval($sock);
                 if (isset($this->s2u[$id])) {
                     $user = $this->s2u[$id];
+
+                    if ($user->rd_toflush) {
+                        if (fflush($sock) == FALSE)
+                            continue;
+                        else
+                            $user->rd_toflush = FALSE;
+                    }
                     $response = $user->rd_cache_get();
                     $do_ping = FALSE;
                     if (($this->curtime - $user->lacc) > (EXPIRE_TIME_RD / 3)) {
@@ -911,7 +938,10 @@ class Sac_a_push {
                         else {
                             $user->rd_cache_set("");
                         }
-                        fflush($sock);
+                        if (fflush($sock) == FALSE) {
+                            $user->rd_toflush = TRUE;
+                            continue;
+                        }
                         $user->rd_kalive_reset($this->curtime);
                     }
                     
@@ -931,10 +961,24 @@ class Sac_a_push {
                 }  // if (isset($this->s2u[$id]...
             }  // foreach ($this->socks...
             printf("\n");
-            $this->app->cds->process();
+            if (defined('CURL_DE_SAC_VERS')) {
+                $this->app->cds->process();
+            }
         }  // while (...
     }  // function run(...
 
+    function pproxy_realip(&$header, $ip_str)
+    {
+        return ($this->provider_proxy->realip($header, $ip_str));
+    }
+
+    function reload($is_first, $prov_proxy)
+    {
+        fprintf(STDERR, "SAP RELOAD STUFF (%d)\n", count($prov_proxy));
+
+        $this->provider_proxy->update($prov_proxy);
+    }
+
     function direct_command($cmdstr)
     {
         GLOBAL $G_alarm_passwd;