Bump year

[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 d4867ad..93319b7 100644 (file)
--- a/src/filter_frontend_net.cpp
+++ b/src/filter_frontend_net.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2012 Index Data
+   Copyright (C) 2005-2013 Index Data
 
 Metaproxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yazpp/limit-connect.h>
 #include <yaz/timing.h>
 #include <yaz/log.h>
+#include <yaz/daemon.h>
 #include "gduutil.hpp"
 
 #include <iostream>
@@ -46,6 +47,7 @@ namespace metaproxy_1 {
             friend class FrontendNet;
             std::string port;
             std::string route;
+            int max_recv_bytes;
         };
         class FrontendNet::Rep {
             friend class FrontendNet;
@@ -441,7 +443,7 @@ void yf::FrontendNet::ZAssocServer::set_package(const mp::Package *package)
 }
 
 void yf::FrontendNet::ZAssocServer::set_thread_pool(
-    ThreadPoolSocketObserver *observer)
+    mp::ThreadPoolSocketObserver *observer)
 {
     m_thread_pool_observer = observer;
 }
@@ -569,7 +571,7 @@ void yf::FrontendNet::My_Timer_Thread::socketNotify(int event)
     m_obs->deleteObserver(this);
 }
 
-void yf::FrontendNet::process(Package &package) const
+void yf::FrontendNet::process(mp::Package &package) const
 {
     if (m_p->az == 0)
         return;
@@ -597,6 +599,7 @@ void yf::FrontendNet::process(Package &package) const
                 size_t i;
                 for (i = 0; i < m_p->m_ports.size(); i++)
                     m_p->az[i]->server("");
+                yaz_daemon_stop();
             }
         }
         int no = m_p->mySocketManager.getNumberOfObservers();
@@ -623,15 +626,21 @@ void yf::FrontendNet::configure(const xmlNode * ptr, bool test_only,
         if (!strcmp((const char *) ptr->name, "port"))
         {
             Port port;
-            const struct _xmlAttr *attr;
-            for (attr = ptr->properties; attr; attr = attr->next)
-            {
-                if (!strcmp((const char *) attr->name, "route"))
-                    port.route = mp::xml::get_text(attr);
-            }
-            port.port = mp::xml::get_text(ptr);
-            ports.push_back(port);
 
+            const char *names[4] = {"route", "max_recv_bytes", "port", 0};
+            std::string values[3];
+
+            mp::xml::parse_attr(ptr, names, values);
+            port.route = values[0];
+            if (values[1].length() > 0)
+                port.max_recv_bytes = atoi(values[1].c_str());
+            else
+                port.max_recv_bytes = 0;
+            if (values[2].length() > 0)
+                port.port = values[2];
+            else
+                port.port = mp::xml::get_text(ptr);
+            ports.push_back(port);
         }
         else if (!strcmp((const char *) ptr->name, "threads"))
         {
@@ -713,6 +722,11 @@ void yf::FrontendNet::set_ports(std::vector<Port> &ports)
             throw yf::FilterException("Unable to bind to address "
                                       + std::string(m_p->m_ports[i].port));
         }
+        COMSTACK cs = as->get_comstack();
+
+        if (cs && m_p->m_ports[i].max_recv_bytes)
+            cs_set_max_recv_bytes(cs, m_p->m_ports[i].max_recv_bytes);
+
     }
 }