* Copyright (c) 1998-2003, Index Data.
* See the file LICENSE for details.
*
- * $Id: proxy.h,v 1.8 2003-10-01 13:13:51 adam Exp $
+ * $Id: proxy.h,v 1.16 2003-10-13 19:16:28 adam Exp $
*/
#include <yaz++/z-assoc.h>
class Yaz_Proxy;
+#define MAX_ZURL_PLEX 10
+
struct Yaz_RecordCache_Entry;
class YAZ_EXPORT Yaz_ProxyConfig {
Yaz_ProxyConfig();
~Yaz_ProxyConfig();
int read_xml(const char *fname);
- void get_target_info(const char *name, const char **url, int *keepalive,
- int *limit_bw, int *limit_pdu, int *limit_req);
- void operator=(const Yaz_ProxyConfig &conf);
+
+ 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,
+ 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,
- int *limit_bw, int *limit_pdu, int *limit_req);
+ 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 *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,
+ char **addinfo);
+ xmlNodePtr find_target_node(const char *name);
const char *get_text(xmlNodePtr ptr);
+ int check_type_1_attributes(ODR odr, xmlNodePtr ptr,
+ Z_AttributeList *attrs,
+ char **addinfo);
+ int check_type_1_structure(ODR odr, xmlNodePtr ptr, Z_RPNStructure *q,
+ char **addinfo);
#endif
int m_copy;
+ int match_list(int v, const char *m);
+ int atoi_l(const char **cp);
+
};
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;
int match (Yaz_RecordCache_Entry *entry,
Odr_oid *syntax, int offset,
Z_RecordComposition *comp);
+ int m_max_size;
};
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
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.
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;
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;
int m_max_record_retrieve;
void handle_max_record_retrieve(Z_APDU *apdu);
void display_diagrecs(Z_DiagRec **pp, int num);
+ Z_Records *create_nonSurrogateDiagnostics(ODR o, int error,
+ 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;
+ 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);
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();
};