zoom: tweak diagnostics for Torus auth

[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 8efda29..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();
@@ -361,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()))
         {
@@ -519,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()
@@ -539,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()
@@ -588,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;