X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2B%2B%2Fproxy.h;h=047f086576bf3a91f55179c9613e1c26e6966fd8;hb=4d4dc93f4044cd685b6e8e2db7a3cd73eb36b7ce;hp=8535546631656cd476c3b9bdf130f6bf216fa062;hpb=72422e361f3ffd16766ff80bef553de08ea2f741;p=yazpp-moved-to-github.git

diff --git a/include/yaz++/proxy.h b/include/yaz++/proxy.h
index 8535546..047f086 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.11 2003-10-08 08:15:01 adam Exp $
+ * $Id: proxy.h,v 1.16 2003-10-13 19:16:28 adam Exp $
  */
 
 #include <yaz++/z-assoc.h>
@@ -16,6 +16,8 @@
 
 class Yaz_Proxy;
 
+#define MAX_ZURL_PLEX 10
+
 struct Yaz_RecordCache_Entry;
 
 class YAZ_EXPORT Yaz_ProxyConfig {
@@ -23,21 +25,40 @@ public:
     Yaz_ProxyConfig();
     ~Yaz_ProxyConfig();
     int read_xml(const char *fname);
-    void get_target_info(const char *name, const char **url, int *keepalive,
+
+    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_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);
-    void operator=(const Yaz_ProxyConfig &conf);
+			 int *max_clients,
+			 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
     xmlDocPtr m_docPtr;
     xmlNodePtr m_proxyPtr;
-    void return_target_info(xmlNodePtr ptr, const char **url, int *keepalive,
+    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 *target_idletime, int *client_idletime,
+			    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,
@@ -68,6 +89,7 @@ class YAZ_EXPORT Yaz_RecordCache {
 
     void copy_searchRequest(Z_SearchRequest *sr);
     void copy_presentRequest(Z_PresentRequest *pr);
+    void set_max_size(int sz);
  private:
     NMEM m_mem;
     Yaz_RecordCache_Entry *m_entries;
@@ -76,6 +98,7 @@ class YAZ_EXPORT Yaz_RecordCache {
     int match (Yaz_RecordCache_Entry *entry,
 	       Odr_oid *syntax, int offset,
 	       Z_RecordComposition *comp);
+    int m_max_size;
 };
 
 class YAZ_EXPORT Yaz_bw {
@@ -94,7 +117,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
@@ -121,9 +145,13 @@ class YAZ_EXPORT Yaz_ProxyClient : public Yaz_Z_Assoc {
     int m_resultSetStartPoint;
     int m_bytes_sent;
     int m_bytes_recv;
+    int m_pdu_recv;
     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.
@@ -141,7 +169,8 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
     Yaz_Proxy *m_parent;
     int m_seqno;
     int m_max_clients;
-    int m_keepalive;
+    int m_keepalive_limit_bw;
+    int m_keepalive_limit_pdu;
     int m_client_idletime;
     int m_target_idletime;
     char *m_proxyTarget;
@@ -150,8 +179,9 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
     long m_seed;
     char *m_optimize;
     int m_session_no;         // sequence for each client session
-    char m_session_str[20];  // session string (time:session_no)
-    Yaz_ProxyConfig m_config;
+    char m_session_str[30];  // session string (time:session_no)
+    Yaz_ProxyConfig *m_config;
+    char *m_config_fname;
     int m_bytes_sent;
     int m_bytes_recv;
     int m_bw_max;
@@ -167,8 +197,16 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
 
     Z_APDU *handle_query_validation(Z_APDU *apdu);
     Z_APDU *handle_syntax_validation(Z_APDU *apdu);
+    const char *load_balance(const char **url);
+    int m_reconfig_flag;
+    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);
@@ -187,6 +225,9 @@ 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; }
     int send_to_client(Z_APDU *apdu);
+    void server(const char *addr);
+    void pre_init();
 };