X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=include%2Fyazproxy%2Fproxy.h;h=5f015fefd7217bfa8e1176645865a1c8daf091c7;hp=8aa8e7e2afc5d563a0aa842454c98b04b979c76b;hb=8acbd42b3c2cc8fec0c3e1da777415cd6ba66820;hpb=d7f41f16caf965adb1a5ffcdaa937787dfcc030a diff --git a/include/yazproxy/proxy.h b/include/yazproxy/proxy.h index 8aa8e7e..5f015fe 100644 --- a/include/yazproxy/proxy.h +++ b/include/yazproxy/proxy.h @@ -1,7 +1,7 @@ -/* $Id: proxy.h,v 1.22 2005-06-25 15:58:33 adam Exp $ - Copyright (c) 1998-2005, Index Data. +/* $Id: proxy.h,v 1.34 2006-04-13 00:02:23 adam Exp $ + Copyright (c) 1998-2006, Index Data. -This file is part of the yaz-proxy. +This file is part of the yazproxy. YAZ proxy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -22,14 +22,16 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #ifndef YAZ_PROXY_H_INCLUDED #define YAZ_PROXY_H_INCLUDED -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include +#include #include +#include class Yaz_Proxy; @@ -39,6 +41,7 @@ class Yaz_Proxy; #define PROXY_LOG_APDU_SERVER 2 #define PROXY_LOG_REQ_CLIENT 4 #define PROXY_LOG_REQ_SERVER 8 +#define PROXY_LOG_IP_CLIENT 16 class Yaz_usemarcon; class Yaz_ProxyConfig; @@ -47,7 +50,7 @@ class Yaz_CharsetConverter; enum YAZ_Proxy_MARCXML_mode { none, - marcxml, + marcxml }; class Msg_Thread; @@ -58,15 +61,18 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Z_Assoc { 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); + void HTTP_Forwarded(Z_GDU *z_gdu); + void connect_stat(bool &block, int &reduce); Yaz_ProxyClient *get_client(Z_APDU *apdu, const char *cookie, const char *proxy_host); void srw_get_client(const char *db, const char **backend_db); Z_APDU *result_set_optimize(Z_APDU *apdu); - void releaseClient(); + void releaseClient(); Yaz_ProxyClient *m_client; yazpp_1::IPDU_Observable *m_PDU_Observable; yazpp_1::ISocketObservable *m_socket_observable; @@ -84,10 +90,11 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::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 - char m_session_str[30]; // session string (time:session_no) + char m_session_str[200]; // session string (time:session_no) Yaz_ProxyConfig *m_config; char *m_config_fname; int m_bytes_sent; @@ -96,16 +103,23 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Z_Assoc { yazpp_1::GDU *m_timeout_gdu; enum timeout_mode { + timeout_busy, timeout_normal, timeout_reduce, timeout_xsl } m_timeout_mode; + int m_max_connect; + int m_max_connect_period; + int m_limit_connect; + int m_limit_connect_period; + 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; + Yaz_bw m_search_stat; + void handle_max_record_retrieve(Z_APDU *apdu); void display_diagrecs(Z_DiagRec **pp, int num); Z_Records *create_nonSurrogateDiagnostics(ODR o, int error, @@ -125,7 +139,7 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Z_Assoc { int m_request_no; 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; @@ -166,7 +180,10 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::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 z_to_srw_diag(ODR o, Z_SRW_searchRetrieveResponse *srw_res, @@ -179,7 +196,7 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::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(); @@ -189,6 +206,7 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Z_Assoc { Yaz_usemarcon *m_usemarcon; Yaz_CharsetConverter *m_charset_converter; yazpp_1::GDUQueue m_in_queue; + LimitConnect m_connect; public: Yaz_Proxy(yazpp_1::IPDU_Observable *the_PDU_Observable, yazpp_1::ISocketObservable *the_socket_observable, @@ -197,7 +215,7 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Z_Assoc { void inc_ref(); - bool dec_ref(); + bool dec_ref(bool main_ptr); int handle_authentication(Z_APDU *apdu); @@ -207,7 +225,7 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Z_Assoc { 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(); + 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); @@ -219,7 +237,8 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Z_Assoc { 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; }; @@ -235,7 +254,9 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::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