Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy

diff --git a/configure.ac b/configure.ac
index 9c8f863..e9a3a21 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ AC_CHECK_FUNCS([localtime_r])
 USEMARCON_INIT
 
 ## YAZPP checks
-YAZPP_INIT([threads],[1.3.1])
+YAZPP_INIT([threads],[1.4.0])
 if test -z "$YAZPPLIB"; then
     AC_MSG_ERROR([YAZ++ development libraries missing])
 fi

diff --git a/debian/control b/debian/control
index 4ab97b9..bdedf09 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Adam Dickmeiss <adam@indexdata.dk>
 Priority: extra
 Build-Depends: debhelper (>= 4),
        libyaz4-dev (>= 4.2.44),
-       libyazpp4-dev (>= 1.3.2),
+       libyazpp5-dev (>= 1.4.0),
        libxslt1-dev,
        libboost-dev,
        libboost-thread-dev,
@@ -43,7 +43,7 @@ Package: libmetaproxy4-dev
 Section: libdevel
 Architecture: any
 Depends: libmetaproxy4 (= ${Source-Version}),
-       libyazpp4-dev (>= 1.3.2),
+       libyazpp5-dev (>= 1.4.0),
        libxslt1-dev,
        libboost-dev,
        libboost-thread-dev,

diff --git a/etc/config0.xml b/etc/config0.xml
index 182839b..ccc7283 100644 (file)
--- a/etc/config0.xml
+++ b/etc/config0.xml
@@ -5,7 +5,7 @@
   <start route="start"/>
   <filters>
     <filter id="frontend" type="frontend_net">
-      <port>@:9070</port>
+      <port max_recv_bytes="1000000">@:9070</port>
       <message>FN</message>
       <stat-req>/fn_stat</stat-req>
     </filter>

diff --git a/include/metaproxy/xmlutil.hpp b/include/metaproxy/xmlutil.hpp
index 945a4ba..c0a09a5 100644 (file)
--- a/include/metaproxy/xmlutil.hpp
+++ b/include/metaproxy/xmlutil.hpp
@@ -29,6 +29,9 @@ namespace metaproxy_1 {
         std::string get_text(const xmlNode *ptr);
         bool get_bool(const xmlNode *ptr, bool default_value);
         int get_int(const xmlNode *ptr, int default_value);
+
+        void parse_attr(const xmlNode *node, const char **names,
+                        std::string *values);
         bool check_attribute(const _xmlAttr *ptr,
                         const std::string &ns,
                         const std::string &name);

diff --git a/metaproxy.spec b/metaproxy.spec
index fc1d85d..53e0161 100644 (file)
--- a/metaproxy.spec
+++ b/metaproxy.spec
@@ -9,7 +9,7 @@ Vendor: Index Data ApS <info@indexdata.dk>
 Source: metaproxy-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prefix: %{_prefix} /etc/metaproxy
-BuildRequires: pkgconfig, libyaz4-devel >= 4.2.44, libyazpp4-devel >= 1.3.2
+BuildRequires: pkgconfig, libyaz4-devel >= 4.2.44, libyazpp5-devel >= 1.4.0
 BuildRequires: libxslt-devel, boost-devel
 Conflicts: cf-engine <= 2.12.5
 Packager: Adam Dickmeiss <adam@indexdata.dk>
@@ -30,7 +30,7 @@ Metaproxy documentation.
 %package -n libmetaproxy4
 Summary: Metaproxy library
 Group: Libraries
-Requires: libyazpp4 >= 1.3.2, libyaz4 >= 4.2.44
+Requires: libyazpp5 >= 1.4.0, libyaz4 >= 4.2.44
 
 %description -n libmetaproxy4
 The Metaproxy libraries.
@@ -38,7 +38,7 @@ The Metaproxy libraries.
 %package -n libmetaproxy4-devel
 Summary: Metaproxy development package
 Group: Development/Libraries
-Requires: libmetaproxy4 = %{version}, libyazpp4-devel, boost-devel
+Requires: libmetaproxy4 = %{version}, libyazpp5-devel, boost-devel
 Conflicts: libmetaproxy3-devel
 
 %description -n libmetaproxy4-devel

diff --git a/src/filter_frontend_net.cpp b/src/filter_frontend_net.cpp
index 3015609..da98215 100644 (file)
--- a/src/filter_frontend_net.cpp
+++ b/src/filter_frontend_net.cpp
@@ -47,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;
@@ -625,8 +626,20 @@ void yf::FrontendNet::configure(const xmlNode * ptr, bool test_only,
         if (!strcmp((const char *) ptr->name, "port"))
         {
             Port port;
-            port.route = mp::xml::get_route(ptr);
-            port.port = mp::xml::get_text(ptr);
+
+            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"))
@@ -709,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);
+
     }
 }
 

diff --git a/src/xmlutil.cpp b/src/xmlutil.cpp
index f48868c..22b04d5 100644 (file)
--- a/src/xmlutil.cpp
+++ b/src/xmlutil.cpp
@@ -74,7 +74,6 @@ bool mp_xml::check_attribute(const _xmlAttr *ptr,
                              const std::string &ns,
                              const std::string &name)
 {
-
     if (!mp::xml::is_attribute(ptr, ns, name))
     {
         std::string got_attr = "'";
@@ -149,37 +148,59 @@ bool mp_xml::check_element_mp(const xmlNode *ptr,
     return true;
 }
 
-std::string mp_xml::get_route(const xmlNode *node, std::string &auth)
+void mp_xml::parse_attr(const xmlNode *node, const char **names,
+                        std::string *values)
 {
-    std::string route_value;
+    size_t i;
+    for (i = 0; names[i]; i++)
+        values[i].clear();
+
     if (node)
     {
         const struct _xmlAttr *attr;
         for (attr = node->properties; attr; attr = attr->next)
         {
-            std::string name = std::string((const char *) attr->name);
             std::string value;
+            const char *name = (const char *) attr->name;
 
             if (attr->children && attr->children->type == XML_TEXT_NODE)
                 value = std::string((const char *)attr->children->content);
-
-            if (name == "route")
-                route_value = value;
-            else if (name == "auth")
-                auth = value;
-            else
-                throw XMLError("Only attribute route allowed"
-                               " in " + std::string((const char *)node->name)
-                               + " element. Got " + std::string(name));
+            for (i = 0; names[i]; i++)
+                if (!strcmp(name, names[i]))
+                {
+                    values[i] = value;
+                    break;
+                }
+            if (!names[i])
+            {
+                throw XMLError("Unsupported attribute: '" +
+                               std::string(name) +
+                               "' in element '" + 
+                               std::string((const char *) node->name) + "'");
+            }
         }
     }
-    return route_value;
+}
+
+std::string mp_xml::get_route(const xmlNode *node, std::string &auth)
+{
+    const char *names[3] = { "route", "auth", 0 };
+    std::string values[2];
+
+    parse_attr(node, names, values);
+
+    auth = values[1];
+    return values[0];
 }
 
 std::string mp_xml::get_route(const xmlNode *node)
 {
-    std::string auth;
-    return get_route(node, auth);
+    const char *names[2] = { "route", 0 };
+    std::string values[1];
+
+    parse_attr(node, names, values);
+
+    return values[0];
 }
 
 const xmlNode* mp_xml::jump_to_children(const xmlNode* node,

diff --git a/xml/schema/filter_frontend_net.rnc b/xml/schema/filter_frontend_net.rnc
index 538c9b2..4cbaacf 100644 (file)
--- a/xml/schema/filter_frontend_net.rnc
+++ b/xml/schema/filter_frontend_net.rnc
@@ -9,6 +9,7 @@ filter_frontend_net =
   element mp:threads { xsd:integer }?,
   element mp:port {
     attribute route { xsd:NCName }?,
+    attribute max_recv_bytes { xsd:integer }?,
     xsd:string
   }+,
   element mp:timeout { xsd:integer }?,