X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2B%2B%2Fproxy.h;h=c40f3e6f5b73bb688b413cdad043a3a9923d11ee;hb=4c287a6c8de2a59e1b9d249c0166bfb6c37cd571;hp=2a0b3e17a98ba0e8c5815e8c43f5289fd86f65fd;hpb=8cd77956b745e79b984bc0c9b74989aeae8dd49d;p=yazpp-moved-to-github.git diff --git a/include/yaz++/proxy.h b/include/yaz++/proxy.h index 2a0b3e1..c40f3e6 100644 --- a/include/yaz++/proxy.h +++ b/include/yaz++/proxy.h @@ -2,13 +2,13 @@ * Copyright (c) 1998-2003, Index Data. * See the file LICENSE for details. * - * $Id: proxy.h,v 1.13 2003-10-08 09:32:48 adam Exp $ + * $Id: proxy.h,v 1.23 2003-12-20 22:44:30 adam Exp $ */ #include #include #include - +#include #if HAVE_XML2 #include #include @@ -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,21 +30,48 @@ 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, + const char **cql2rpn, + const char **zeerex); + + 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); - void operator=(const Yaz_ProxyConfig &conf); + int *max_clients, + int *keepalive_limit_bw, int *keepalive_limit_pdu, + int *pre_init, + const char **cql2rpn, + const char **zeerex); + 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); + int mycmp(const char *hay, const char *item, size_t len); #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, const char **cql2rpn, + const char **zeerex); 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, @@ -98,9 +130,12 @@ 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_GDU(Z_GDU *apdu, int len); void recv_Z_PDU(Z_APDU *apdu, int len); + void recv_HTTP_response(Z_HTTP_Response *apdu, int len); IYaz_PDU_Observer* sessionNotify (IYaz_PDU_Observable *the_PDU_Observable, int fd); void shutdown(); @@ -125,17 +160,33 @@ 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; }; +class YAZ_EXPORT Yaz_cql2rpn { + public: + Yaz_cql2rpn(); + ~Yaz_cql2rpn(); + void set_pqf_file(const char *fname); + int query_transform(const char *cql, Z_RPNQuery **rpnquery, ODR o); + private: + cql_transform_t m_transform; +}; + + /// Information Retrieval Proxy Server. class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc { private: char *get_cookie(Z_OtherInformation **otherInfo); char *get_proxy(Z_OtherInformation **otherInfo); - Yaz_ProxyClient *get_client(Z_APDU *apdu); + Yaz_ProxyClient *get_client(Z_APDU *apdu, const char *cookie, + const char *proxy_host); Z_APDU *result_set_optimize(Z_APDU *apdu); void shutdown(); @@ -145,7 +196,9 @@ 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_log_mask; + int m_keepalive_limit_bw; + int m_keepalive_limit_pdu; int m_client_idletime; int m_target_idletime; char *m_proxyTarget; @@ -154,15 +207,16 @@ 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; Yaz_bw m_bw_stat; int m_pdu_max; Yaz_bw m_pdu_stat; - Z_APDU *m_bw_hold_PDU; + Z_GDU *m_bw_hold_PDU; int m_max_record_retrieve; void handle_max_record_retrieve(Z_APDU *apdu); void display_diagrecs(Z_DiagRec **pp, int num); @@ -170,13 +224,48 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc { const char *addinfo); Z_APDU *handle_query_validation(Z_APDU *apdu); + Z_APDU *handle_query_transformation(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); + Z_APDU *m_initRequest_apdu; + NMEM m_initRequest_mem; + Z_APDU *m_apdu_invalid_session; + NMEM m_mem_invalid_session; + int send_PDU_convert(Z_APDU *apdu, int *len); + ODR m_s2z_odr_init; + ODR m_s2z_odr_search; + int m_s2z_hit_count; + int m_s2z_packing; + Z_APDU *m_s2z_init_apdu; + Z_APDU *m_s2z_search_apdu; + Z_APDU *m_s2z_present_apdu; + char *m_soap_ns; + int send_to_srw_client_error(int error); + int send_to_srw_client_ok(int hits, Z_Records *records, int start); + int send_http_response(int code); + int send_srw_response(Z_SRW_PDU *srw_pdu); + int send_srw_explain(); + + int z_to_srw_diag(ODR o, Z_SRW_searchRetrieveResponse *srw_res, + Z_DefaultDiagFormat *ddf); + int m_http_keepalive; + const char *m_http_version; + Yaz_cql2rpn m_cql2rpn; + const char *m_zeerex_fname; 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 recv_GDU(Z_GDU *apdu, int len); + void handle_incoming_HTTP(Z_HTTP_Request *req); + void handle_incoming_Z_PDU(Z_APDU *apdu); IYaz_PDU_Observer* sessionNotify (IYaz_PDU_Observable *the_PDU_Observable, int fd); void failNotify(); @@ -192,6 +281,11 @@ 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); + void reconfig() { m_reconfig_flag = 1; } int send_to_client(Z_APDU *apdu); + int server(const char *addr); + void pre_init(); + int get_log_mask() { return m_log_mask; }; + int handle_init_response_for_invalid_session(Z_APDU *apdu); };