Supply YAZ Proxy version in Z39.50 init responses

[yazproxy-moved-to-github.git] / src / yaz-proxy-config.cpp

diff --git a/src/yaz-proxy-config.cpp b/src/yaz-proxy-config.cpp
index f7ab3d9..dbf03a5 100644 (file)
--- a/src/yaz-proxy-config.cpp
+++ b/src/yaz-proxy-config.cpp
@@ -1,7 +1,7 @@
-/* $Id: yaz-proxy-config.cpp,v 1.25 2006-03-25 10:59:14 adam Exp $
-   Copyright (c) 1998-2005, Index Data.
+/* $Id: yaz-proxy-config.cpp,v 1.30 2006-04-06 16:25:21 adam Exp $
+   Copyright (c) 1998-2006, Index Data.
 
-This file is part of the yaz-proxy.
+This file is part of the yazproxy.
 
 YAZ proxy 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
@@ -39,7 +39,7 @@ class Yaz_ProxyConfigP {
     xmlNodePtr m_proxyPtr;
     void return_target_info(xmlNodePtr ptr, const char **url,
                             int *limit_bw, int *limit_pdu, int *limit_req,
-                            int *limit_search, int *limit_connect,
+                            int *limit_search,
                             int *target_idletime, int *client_idletime,
                             int *keepalive_limit_bw, int *keepalive_limit_pdu,
                             int *pre_init, const char **cql2rpn,
@@ -49,12 +49,13 @@ class Yaz_ProxyConfigP {
                             const char **default_client_query_charset);
     void return_limit(xmlNodePtr ptr,
                       int *limit_bw, int *limit_pdu, int *limit_req,
-                      int *limit_search, int *limit_connect);
+                      int *limit_search);
     int check_type_1(ODR odr, xmlNodePtr ptr, Z_RPNQuery *query,
                      char **addinfo);
     xmlNodePtr find_target_node(const char *name, const char *db);
     xmlNodePtr find_target_db(xmlNodePtr ptr, const char *db);
     const char *get_text(xmlNodePtr ptr);
+    void get_period(xmlNodePtr ptr, int *period);
     int check_type_1_attributes(ODR odr, xmlNodePtr ptr,
                                 Z_AttributeList *attrs,
                                 char **addinfo);
@@ -165,6 +166,18 @@ const char *Yaz_ProxyConfigP::get_text(xmlNodePtr ptr)
         }
     return 0;
 }
+
+void Yaz_ProxyConfigP::get_period(xmlNodePtr ptr, int *period)
+{
+    struct _xmlAttr *attr;
+    *period = 60;
+    for (attr = ptr->properties; attr; attr = attr->next)
+    {
+        if (!strcmp((const char *) attr->name, "period") &&
+            attr->children && attr->children->type == XML_TEXT_NODE)
+            *period = atoi((const char *) attr->children->content);
+    }
+}
 #endif
 
 #if HAVE_XSLT
@@ -172,8 +185,7 @@ void Yaz_ProxyConfigP::return_limit(xmlNodePtr ptr,
                                     int *limit_bw,
                                     int *limit_pdu,
                                     int *limit_req,
-                                    int *limit_search,
-                                    int *limit_connect)
+                                    int *limit_search)
 {
     for (ptr = ptr->children; ptr; ptr = ptr->next)
     {
@@ -205,13 +217,6 @@ void Yaz_ProxyConfigP::return_limit(xmlNodePtr ptr,
             if (t)
                 *limit_search = atoi(t);
         }
-        if (ptr->type == XML_ELEMENT_NODE 
-            && !strcmp((const char *) ptr->name, "connect"))
-        {
-            const char *t = get_text(ptr);
-            if (t)
-                *limit_connect = atoi(t);
-        }
     }
 }
 #endif
@@ -223,7 +228,6 @@ void Yaz_ProxyConfigP::return_target_info(xmlNodePtr ptr,
                                           int *limit_pdu,
                                           int *limit_req,
                                           int *limit_search,
-                                          int *limit_connect,
                                           int *target_idletime,
                                           int *client_idletime,
                                           int *keepalive_limit_bw,
@@ -263,12 +267,12 @@ void Yaz_ProxyConfigP::return_target_info(xmlNodePtr ptr,
             *keepalive_limit_bw = 500000;
             *keepalive_limit_pdu = 1000;
             return_limit(ptr, keepalive_limit_bw, keepalive_limit_pdu,
-                         &dummy, &dummy, &dummy);
+                         &dummy, &dummy);
         }
         if (ptr->type == XML_ELEMENT_NODE 
             && !strcmp((const char *) ptr->name, "limit"))
             return_limit(ptr, limit_bw, limit_pdu, limit_req,
-                         limit_search, limit_connect);
+                         limit_search);
         if (ptr->type == XML_ELEMENT_NODE 
             && !strcmp((const char *) ptr->name, "target-timeout"))
         {
@@ -545,6 +549,8 @@ const char *Yaz_ProxyConfig::check_mime_type(const char *path)
         {".jpg", "image/jpeg"},
         {".png", "image/png"},
         {".gif", "image/gif"},
+        {".css", "text/css"},
+        {".pdf", "application/pdf"},
         {0, "text/plain"},
         {0, 0},
     };
@@ -933,7 +939,6 @@ int Yaz_ProxyConfig::get_target_no(int no,
                                    int *limit_pdu,
                                    int *limit_req,
                                    int *limit_search,
-                                   int *limit_connect,
                                    int *target_idletime,
                                    int *client_idletime,
                                    int *max_clients,
@@ -970,7 +975,7 @@ int Yaz_ProxyConfig::get_target_no(int no,
                 m_cp->return_target_info(
                     ptr, url,
                     limit_bw, limit_pdu, limit_req,
-                    limit_search, limit_connect,
+                    limit_search,
                     target_idletime, client_idletime,
                     keepalive_limit_bw, keepalive_limit_pdu,
                     pre_init, cql2rpn,
@@ -991,9 +996,36 @@ int Yaz_ProxyConfigP::mycmp(const char *hay, const char *item, size_t len)
     return 0;
 }
 
+int Yaz_ProxyConfig::get_file_access_info(const char *path)
+{
+#if HAVE_XSLT
+    xmlNodePtr ptr;
+    if (!m_cp->m_proxyPtr)
+        return 0;
+    for (ptr = m_cp->m_proxyPtr->children; ptr; ptr = ptr->next)
+    {
+        if (ptr->type == XML_ELEMENT_NODE
+            && !strcmp((const char *) ptr->name, "docpath"))
+        {
+            const char *docpath = m_cp->get_text(ptr);
+            size_t docpath_len = strlen(docpath);
+            if (docpath_len < strlen(path) && path[docpath_len] == '/'
+                && !memcmp(docpath, path, docpath_len))
+                return 1;
+        }
+    }
+#endif
+    return 0;
+}
+
 void Yaz_ProxyConfig::get_generic_info(int *log_mask,
-                                       int *max_clients)
+                                       int *max_clients,
+                                       int *max_connect,
+                                       int *limit_connect,
+                                       int *period_connect)
 {
+    *max_connect = 0;
+    *limit_connect = 0;
 #if HAVE_XSLT
     xmlNodePtr ptr;
     if (!m_cp->m_proxyPtr)
@@ -1019,6 +1051,8 @@ void Yaz_ProxyConfig::get_generic_info(int *log_mask,
                     *log_mask |= PROXY_LOG_REQ_CLIENT;
                 if (m_cp->mycmp(v, "server-requests", len))
                     *log_mask |= PROXY_LOG_REQ_SERVER;
+                if (m_cp->mycmp(v, "client-ip", len))
+                    *log_mask |= PROXY_LOG_IP_CLIENT;
                 if (isdigit(*v))
                     *log_mask |= atoi(v);
                 if (*cp == ',')
@@ -1028,7 +1062,7 @@ void Yaz_ProxyConfig::get_generic_info(int *log_mask,
                 v = cp;
             }
         }
-        if (ptr->type == XML_ELEMENT_NODE &&
+        else if (ptr->type == XML_ELEMENT_NODE &&
             !strcmp((const char *) ptr->name, "max-clients"))
         {
             const char *t = m_cp->get_text(ptr);
@@ -1039,6 +1073,42 @@ void Yaz_ProxyConfig::get_generic_info(int *log_mask,
                     *max_clients = 1;
             }
         }
+        else if (ptr->type == XML_ELEMENT_NODE &&
+            !strcmp((const char *) ptr->name, "period-connect"))
+        {
+            const char *t = m_cp->get_text(ptr);
+            if (t)
+                *period_connect = atoi(t);
+        }
+        else if (ptr->type == XML_ELEMENT_NODE &&
+            !strcmp((const char *) ptr->name, "max-connect"))
+        {
+            const char *t = m_cp->get_text(ptr);
+            if (t)
+            {
+                *max_connect = atoi(t);
+            }
+        }
+        else if (ptr->type == XML_ELEMENT_NODE &&
+            !strcmp((const char *) ptr->name, "limit-connect"))
+        {
+            const char *t = m_cp->get_text(ptr);
+            if (t)
+            {
+                *limit_connect = atoi(t);
+            }
+        }
+        else if (ptr->type == XML_ELEMENT_NODE &&
+            !strcmp((const char *) ptr->name, "target"))
+            ;
+        else if (ptr->type == XML_ELEMENT_NODE &&
+            !strcmp((const char *) ptr->name, "docpath"))
+            ;
+        else if (ptr->type == XML_ELEMENT_NODE)
+        {
+            yaz_log(YLOG_WARN, "0 Unknown element %s in yazproxy config",
+                    ptr->name);
+        }
     }
 #endif
 }
@@ -1167,7 +1237,6 @@ void Yaz_ProxyConfig::get_target_info(const char *name,
                                       int *limit_pdu,
                                       int *limit_req,
                                       int *limit_search,
-                                      int *limit_connect,
                                       int *target_idletime,
                                       int *client_idletime,
                                       int *max_clients,
@@ -1212,7 +1281,7 @@ void Yaz_ProxyConfig::get_target_info(const char *name,
             url[1] = 0;
         }
         m_cp->return_target_info(ptr, url, limit_bw, limit_pdu, limit_req,
-                                 limit_search, limit_connect,
+                                 limit_search,
                                  target_idletime, client_idletime,
                                  keepalive_limit_bw, keepalive_limit_pdu,
                                  pre_init, cql2rpn,