X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2B%2B%2Fproxy.h;h=78ecf4caa8f1beb38344a433ebe51f17e20022cf;hb=92c0519af66131a46fbb398ce037009be2e8d0c5;hp=4cd619caa707628f2bf78d12291c49dfb47c32ef;hpb=cf75ac8890f84648d5960d4b07fea7aab9a6eff1;p=yazpp-moved-to-github.git

diff --git a/include/yaz++/proxy.h b/include/yaz++/proxy.h
index 4cd619c..78ecf4c 100644
--- a/include/yaz++/proxy.h
+++ b/include/yaz++/proxy.h
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2003, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: proxy.h,v 1.14 2003-10-09 12:11:09 adam Exp $
+ * $Id: proxy.h,v 1.20 2003-10-20 18:31:43 adam Exp $
  */
 
 #include <yaz++/z-assoc.h>
@@ -18,6 +18,11 @@ class Yaz_Proxy;
 
 #define MAX_ZURL_PLEX 10
 
+#define PROXY_LOG_APDU_CLIENT 1
+#define PROXY_LOG_APDU_SERVER 2
+#define PROXY_LOG_REQ_CLIENT 4
+#define PROXY_LOG_REQ_SERVER 8
+
 struct Yaz_RecordCache_Entry;
 
 class YAZ_EXPORT Yaz_ProxyConfig {
@@ -25,23 +30,43 @@ public:
     Yaz_ProxyConfig();
     ~Yaz_ProxyConfig();
     int read_xml(const char *fname);
+
+    int get_target_no(int no,
+		      const char **name,
+		      const char **url,
+		      int *limit_bw,
+		      int *limit_pdu,
+		      int *limit_req,
+		      int *target_idletime,
+		      int *client_idletime,
+		      int *max_clients,
+		      int *keepalive_limit_bw,
+		      int *keepalive_limit_pdu,
+		      int *pre_init);
+    
+    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 *target_idletime, int *client_idletime,
 			 int *max_clients,
-			 int *keepalive_limit_bw, int *keepalive_limit_pdu);
-    void operator=(const Yaz_ProxyConfig &conf);
+			 int *keepalive_limit_bw, int *keepalive_limit_pdu,
+			 int *pre_init);
+
     int check_query(ODR odr, const char *name, Z_Query *query, char **addinfo);
     int check_syntax(ODR odr, const char *name,
 		     Odr_oid *syntax, char **addinfo);
 private:
+    void operator=(const Yaz_ProxyConfig &conf);
 #if HAVE_XML2
+    int mycmp(const char *hay, const char *item, size_t len);
     xmlDocPtr m_docPtr;
     xmlNodePtr m_proxyPtr;
     void return_target_info(xmlNodePtr ptr, const char **url,
 			    int *limit_bw, int *limit_pdu, int *limit_req,
 			    int *target_idletime, int *client_idletime,
-			    int *keepalive_limit_bw, int *keepalive_limit_pdu);
+			    int *keepalive_limit_bw, int *keepalive_limit_pdu,
+			    int *pre_init);
     void return_limit(xmlNodePtr ptr,
 		      int *limit_bw, int *limit_pdu, int *limit_req);
     int check_type_1(ODR odr, xmlNodePtr ptr, Z_RPNQuery *query,
@@ -100,7 +125,8 @@ class YAZ_EXPORT Yaz_bw {
 /// Private class
 class YAZ_EXPORT Yaz_ProxyClient : public Yaz_Z_Assoc {
     friend class Yaz_Proxy;
-    Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable);
+    Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable,
+		    Yaz_Proxy *parent);
     ~Yaz_ProxyClient();
     void recv_Z_PDU(Z_APDU *apdu, int len);
     IYaz_PDU_Observer* sessionNotify
@@ -131,6 +157,9 @@ class YAZ_EXPORT Yaz_ProxyClient : public Yaz_Z_Assoc {
     ODR m_init_odr;
     Z_APDU *m_initResponse;
     Yaz_RecordCache m_cache;
+    void pre_init_client();
+    int m_target_idletime;
+    Yaz_Proxy *m_root;
 };
 
 /// Information Retrieval Proxy Server.
@@ -148,6 +177,7 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
     Yaz_Proxy *m_parent;
     int m_seqno;
     int m_max_clients;
+    int m_log_mask;
     int m_keepalive_limit_bw;
     int m_keepalive_limit_pdu;
     int m_client_idletime;
@@ -159,7 +189,7 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
     char *m_optimize;
     int m_session_no;         // sequence for each client session
     char m_session_str[30];  // session string (time:session_no)
-    Yaz_ProxyConfig m_config;
+    Yaz_ProxyConfig *m_config;
     char *m_config_fname;
     int m_bytes_sent;
     int m_bytes_recv;
@@ -178,11 +208,14 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
     Z_APDU *handle_syntax_validation(Z_APDU *apdu);
     const char *load_balance(const char **url);
     int m_reconfig_flag;
-    void check_reconfigure();
+    Yaz_ProxyConfig *check_reconfigure();
     int m_request_no;
     int m_invalid_session;
+    int m_marcxml_flag;
+    void convert_to_marcxml(Z_NamePlusRecordList *p);
  public:
-    Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable);
+    Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable,
+	      Yaz_Proxy *parent = 0);
     ~Yaz_Proxy();
     void recv_Z_PDU(Z_APDU *apdu, int len);
     void recv_Z_PDU_0(Z_APDU *apdu);
@@ -201,7 +234,10 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
     void set_target_idletime (int t) { m_target_idletime = (t > 1) ? t : 600; };
     int get_target_idletime () { return m_target_idletime; }
     int set_config(const char *name);
-    int reconfig() { m_reconfig_flag = 1; }
+    void reconfig() { m_reconfig_flag = 1; }
     int send_to_client(Z_APDU *apdu);
+    void server(const char *addr);
+    void pre_init();
+    int get_log_mask() { return m_log_mask; };
 };