X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=include%2Fyazproxy%2Fproxy.h;h=5a6ae44c5e9c547a71a93c39c7b38f308fba20fb;hp=f217c97d21dfe7e308123e4c2f9ce3b233467d10;hb=36388cfc9c49bf00dfbb3cc9932504a77af9b6f2;hpb=eb2b00deb4ecc5a3fbfbef11f57790c1659ab3e2 diff --git a/include/yazproxy/proxy.h b/include/yazproxy/proxy.h index f217c97..5a6ae44 100644 --- a/include/yazproxy/proxy.h +++ b/include/yazproxy/proxy.h @@ -1,4 +1,4 @@ -/* $Id: proxy.h,v 1.18 2005-06-02 06:40:46 adam Exp $ +/* $Id: proxy.h,v 1.27 2006-03-25 10:59:14 adam Exp $ Copyright (c) 1998-2005, Index Data. This file is part of the yaz-proxy. @@ -28,6 +28,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include +#include +#include #include class Yaz_Proxy; @@ -52,22 +54,24 @@ enum YAZ_Proxy_MARCXML_mode { class Msg_Thread; /// Information Retrieval Proxy Server. -class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Yaz_Z_Assoc { +class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Z_Assoc { friend class Proxy_Msg; private: + char *m_peername; + int m_ref_count; + bool m_main_ptr_dec; char *get_cookie(Z_OtherInformation **otherInfo); char *get_proxy(Z_OtherInformation **otherInfo); void get_charset_and_lang_negotiation(Z_OtherInformation **otherInfo, - char **charstes, char **langs, int *selected); + char **charstes, char **langs, int *selected); Yaz_ProxyClient *get_client(Z_APDU *apdu, const char *cookie, - const char *proxy_host); + const char *proxy_host); void srw_get_client(const char *db, const char **backend_db); Z_APDU *result_set_optimize(Z_APDU *apdu); - void shutdown(); - void releaseClient(); + void releaseClient(); Yaz_ProxyClient *m_client; - yazpp_1::IYaz_PDU_Observable *m_PDU_Observable; - yazpp_1::IYazSocketObservable *m_socket_observable; + yazpp_1::IPDU_Observable *m_PDU_Observable; + yazpp_1::ISocketObservable *m_socket_observable; Yaz_ProxyClient *m_clientPool; Yaz_Proxy *m_parent; int m_seqno; @@ -82,6 +86,7 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Yaz_Z_Assoc { char *m_default_target; char *m_proxy_negotiation_charset; char *m_proxy_negotiation_lang; + char *m_proxy_negotiation_default_charset; long m_seed; char *m_optimize; int m_session_no; // sequence for each client session @@ -91,15 +96,25 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Yaz_Z_Assoc { int m_bytes_sent; int m_bytes_recv; int m_bw_max; + + yazpp_1::GDU *m_timeout_gdu; + enum timeout_mode { + timeout_busy, + timeout_normal, + timeout_reduce, + timeout_xsl + } m_timeout_mode; + + int m_connect_max; + int m_search_max; Yaz_bw m_bw_stat; int m_pdu_max; Yaz_bw m_pdu_stat; - 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); Z_Records *create_nonSurrogateDiagnostics(ODR o, int error, - const char *addinfo); + const char *addinfo); Z_APDU *handle_query_validation(Z_APDU *apdu); Z_APDU *handle_query_transformation(Z_APDU *apdu); @@ -113,9 +128,9 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Yaz_Z_Assoc { int m_reconfig_flag; Yaz_ProxyConfig *check_reconfigure(); int m_request_no; - int m_invalid_session; + int m_flag_invalid_session; YAZ_Proxy_MARCXML_mode m_marcxml_mode; - void *m_stylesheet_xsp; // Really libxslt's xsltStylesheetPtr + void *m_stylesheet_xsp; // Really libxslt's xsltStylesheetPtr int m_stylesheet_offset; Z_APDU *m_stylesheet_apdu; Z_NamePlusRecordList *m_stylesheet_nprl; @@ -156,11 +171,14 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Yaz_Z_Assoc { int send_to_srw_client_error(int error, const char *add); 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_response(Z_SRW_PDU *srw_pdu, int http_code = 200); + int send_srw_search_response(Z_SRW_diagnostic *diagnostics, + int num_diagnostics, + int http_code = 200); int send_srw_explain_response(Z_SRW_diagnostic *diagnostics, - int num_diagnostics); + int num_diagnostics); int z_to_srw_diag(ODR o, Z_SRW_searchRetrieveResponse *srw_res, - Z_DefaultDiagFormat *ddf); + Z_DefaultDiagFormat *ddf); int m_http_keepalive; const char *m_http_version; yazpp_1::Yaz_cql2rpn m_cql2rpn; @@ -169,7 +187,7 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Yaz_Z_Assoc { Z_ElementSetNames *mk_esn_from_schema(ODR o, const char *schema); Z_ReferenceId *m_referenceId; NMEM m_referenceId_mem; - + #define NO_SPARE_SOLARIS_FD 10 int m_lo_fd[NO_SPARE_SOLARIS_FD]; void low_socket_open(); @@ -178,28 +196,39 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Yaz_Z_Assoc { char *m_usemarcon_ini_stage2; Yaz_usemarcon *m_usemarcon; Yaz_CharsetConverter *m_charset_converter; + yazpp_1::GDUQueue m_in_queue; public: - Yaz_Proxy(yazpp_1::IYaz_PDU_Observable *the_PDU_Observable, - yazpp_1::IYazSocketObservable *the_socket_observable, - Yaz_Proxy *parent = 0); + Yaz_Proxy(yazpp_1::IPDU_Observable *the_PDU_Observable, + yazpp_1::ISocketObservable *the_socket_observable, + Yaz_Proxy *parent = 0); ~Yaz_Proxy(); + + + void inc_ref(); + bool dec_ref(bool main_ptr); + + int handle_authentication(Z_APDU *apdu); void result_authentication(Z_APDU *apdu, int ret); void handle_init(Z_APDU *apdu); void inc_request_no(); void recv_GDU(Z_GDU *apdu, int len); + void recv_GDU_reduce(yazpp_1::GDU *gdu); + void recv_GDU_normal(yazpp_1::GDU *gdu); + void recv_GDU_more(bool normal); void handle_incoming_HTTP(Z_HTTP_Request *req); void handle_incoming_Z_PDU(Z_APDU *apdu); void handle_incoming_Z_PDU_2(Z_APDU *apdu); - IYaz_PDU_Observer* sessionNotify - (yazpp_1::IYaz_PDU_Observable *the_PDU_Observable, int fd); + IPDU_Observer *sessionNotify(yazpp_1::IPDU_Observable *the_PDU_Observable, + int fd); void failNotify(); void timeoutNotify(); void connectNotify(); void markInvalid(); const char *option(const char *name, const char *value); void set_default_target(const char *target); - void set_proxy_negotiation (const char *charset, const char *lang); + void set_proxy_negotiation(const char *charset, const char *lang, + const char *default_charset); void set_target_charset(const char *charset); char *get_proxy_target() { return m_proxyTarget; }; char *get_session_str() { return m_session_str; }; @@ -215,7 +244,17 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Yaz_Z_Assoc { int get_log_mask() { return m_log_mask; }; int handle_init_response_for_invalid_session(Z_APDU *apdu); void set_debug_mode(int mode); + void send_response_fail_client(const char *addr); Msg_Thread *m_my_thread; + void base64_decode(const char *base64, char *buf, int buf_len); }; #endif +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +