Log request number. More configurable keepalive with pdu/bw limits.

[yazpp-moved-to-github.git] / include / yaz++ / proxy.h

diff --git a/include/yaz++/proxy.h b/include/yaz++/proxy.h
index ca44ea0..4cd619c 100644 (file)
--- 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.10 2003-10-06 08:08:49 adam Exp $
+ * $Id: proxy.h,v 1.14 2003-10-09 12:11:09 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,19 +25,23 @@ public:
     Yaz_ProxyConfig();
     ~Yaz_ProxyConfig();
     int read_xml(const char *fname);
-    void get_target_info(const char *name, const char **url, int *keepalive,
+    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 *max_clients,
+                        int *keepalive_limit_bw, int *keepalive_limit_pdu);
     void operator=(const Yaz_ProxyConfig &conf);
     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:
 #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);
     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,
@@ -66,6 +72,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;
@@ -74,6 +81,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 {
@@ -119,6 +127,7 @@ 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;
@@ -139,7 +148,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;
@@ -148,8 +158,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)
+    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;
@@ -164,6 +175,12 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
                                              const char *addinfo);
 
     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;
+    void check_reconfigure();
+    int m_request_no;
+    int m_invalid_session;
  public:
     Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable);
     ~Yaz_Proxy();
@@ -184,6 +201,7 @@ 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);
 };