zoom: escape user/pass/ip in Torus auth lookup

[metaproxy-moved-to-github.git] / src / filter_frontend_net.cpp

diff --git a/src/filter_frontend_net.cpp b/src/filter_frontend_net.cpp
index b9526c5..7f448a2 100644 (file)
--- a/src/filter_frontend_net.cpp
+++ b/src/filter_frontend_net.cpp
@@ -64,6 +64,7 @@ namespace metaproxy_1 {
             double m_duration_max;
             double m_duration_min;
             double m_duration_total;
+            bool m_stop;
         public:
             Rep();
             ~Rep();
@@ -302,7 +303,7 @@ void yf::FrontendNet::ZAssocChild::report(Z_HTTP_Request *hreq)
         number_total += m_p->m_duration_freq[i];
     number_total += m_p->m_duration_freq[i];
     
-    wrbuf_puts(w, "<?xml version=\"1.0\">\n");
+    wrbuf_puts(w, "<?xml version=\"1.0\"?>\n");
     wrbuf_puts(w, "<frontend_net>\n");
     wrbuf_printf(w, "  <responses frequency=\"%d\">\n", number_total);
     for (i = 0; m_p->m_duration_lim[i] != 0.0; i++)
@@ -334,6 +335,14 @@ void yf::FrontendNet::ZAssocChild::report(Z_HTTP_Request *hreq)
             m_p->m_duration_total / number_total);
        
     wrbuf_puts(w, " </responses>\n");
+ 
+    int thread_busy;
+    int thread_total;
+    m_thread_pool_observer->get_thread_info(thread_busy, thread_total);
+    
+    wrbuf_printf(w, " <thread_info busy=\"%d\" total=\"%d\"/>\n",
+                 thread_busy, thread_total);
+    
     wrbuf_puts(w, "</frontend_net>\n");
     
     hres->content_len = w.len();
@@ -353,6 +362,10 @@ void yf::FrontendNet::ZAssocChild::recv_GDU(Z_GDU *z_pdu, int len)
     {
         Z_HTTP_Request *hreq = z_pdu->u.HTTP_Request;
 
+        const char *f = z_HTTP_header_lookup(hreq->headers, "X-Forwarded-For");
+        if (f)
+            p->origin().set_tcpip_address(std::string(f), m_session.id());
+
         if (m_p->m_stat_req.length()
             && !strcmp(hreq->path, m_p->m_stat_req.c_str()))
         {
@@ -511,6 +524,7 @@ yf::FrontendNet::Rep::Rep()
     m_duration_max = 0.0;
     m_duration_min = 0.0;
     m_duration_total = 0.0;
+    m_stop = false;
 }
 
 yf::FrontendNet::Rep::~Rep()
@@ -531,12 +545,7 @@ yf::FrontendNet::~FrontendNet()
 
 void yf::FrontendNet::stop() const
 {
-    if (m_p->az)
-    {
-        size_t i;
-        for (i = 0; i < m_p->m_ports.size(); i++)
-            m_p->az[i]->server("");
-    }
+    m_p->m_stop = true;
 }
 
 bool yf::FrontendNet::My_Timer_Thread::timeout()
@@ -580,6 +589,16 @@ void yf::FrontendNet::process(Package &package) const
     }
     while (m_p->mySocketManager.processEvent() > 0)
     {
+        if (m_p->m_stop)
+        {
+            m_p->m_stop = false;
+            if (m_p->az)
+            {
+                size_t i;
+                for (i = 0; i < m_p->m_ports.size(); i++)
+                    m_p->az[i]->server("");
+            }
+        }
         int no = m_p->mySocketManager.getNumberOfObservers();
         if (no <= 1)
             break;