X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fproxyp.h;h=b161fdfb2ec256bab110ec74a2c7cde19bd684fc;hb=16fee003605b650c1a329694f060c27b5be5e95b;hp=c7c6a6c4738ee753f1c57b9eb3c3da8c11ff2b0e;hpb=d7f41f16caf965adb1a5ffcdaa937787dfcc030a;p=yazproxy-moved-to-github.git

diff --git a/src/proxyp.h b/src/proxyp.h
index c7c6a6c..b161fdf 100644
--- a/src/proxyp.h
+++ b/src/proxyp.h
@@ -1,4 +1,4 @@
-/* $Id: proxyp.h,v 1.9 2005-06-25 15:58:33 adam Exp $
+/* $Id: proxyp.h,v 1.13 2006-03-29 13:33:47 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -31,7 +31,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <objectlist.h>
 #endif
 
-#include <yaz++/record-cache.h>
+#include <yazpp/record-cache.h>
 #include <yazproxy/proxy.h>
 #include <yazproxy/module.h>
 
@@ -90,6 +90,8 @@ public:
                       int *limit_bw,
                       int *limit_pdu,
                       int *limit_req,
+                      int *limit_search,
+                      int *limit_connect,
                       int *target_idletime,
                       int *client_idletime,
                       int *max_clients,
@@ -100,12 +102,14 @@ public:
                       const char **authentication,
                       const char **negotiation_charset,
                       const char **negotiation_lang,
-                      const char **query_charset);
-    
+                      const char **query_charset,
+                      const char **default_client_query_charset);
+
     void get_generic_info(int *log_mask, int *max_clients);
 
     void get_target_info(const char *name, const char **url,
                          int *limit_bw, int *limit_pdu, int *limit_req,
+                         int *limit_search, int *limit_connect,
                          int *target_idletime, int *client_idletime,
                          int *max_clients,
                          int *keepalive_limit_bw, int *keepalive_limit_pdu,
@@ -113,7 +117,8 @@ public:
                          const char **cql2rpn,
                          const char **negotiation_charset,
                          const char **negotiation_lang,
-                         const char **query_charset);
+                         const char **query_charset,
+                         const char **default_client_query_charset);
 
     const char *check_mime_type(const char *path);
     int check_query(ODR odr, const char *name, Z_Query *query, char **addinfo);
@@ -182,6 +187,12 @@ class Yaz_ProxyClient : public yazpp_1::Z_Assoc {
     void pre_init_client();
     int m_target_idletime;
     Yaz_Proxy *m_root;
+    char *m_idAuthentication_ber_buf;
+    int m_idAuthentication_ber_size;
+    ODR m_idAuthentication_odr;
+    void set_idAuthentication(Z_APDU *apdu);
+    bool compare_idAuthentication(Z_APDU *apdu);
+    bool compare_charset(Z_APDU *apdu);
 };
 
 /*