X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=src%2Fproxyp.h;h=08af5f0432214f5e686f1372b1942edf5ea7493d;hp=7455bbd8606520180d3e81953dc0a9ba5295f68f;hb=36388cfc9c49bf00dfbb3cc9932504a77af9b6f2;hpb=6699ea1b1b538de074500e2c740152135dfa75c5 diff --git a/src/proxyp.h b/src/proxyp.h index 7455bbd..08af5f0 100644 --- a/src/proxyp.h +++ b/src/proxyp.h @@ -1,4 +1,4 @@ -/* $Id: proxyp.h,v 1.4 2005-05-04 08:31:44 adam Exp $ +/* $Id: proxyp.h,v 1.12 2006-03-25 10:59:14 adam Exp $ Copyright (c) 1998-2005, Index Data. This file is part of the yaz-proxy. @@ -31,6 +31,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #endif +#include #include #include @@ -42,8 +43,8 @@ class Yaz_usemarcon { ~Yaz_usemarcon(); int convert(const char *stage1, const char *stage2, - const char *input, int input_len, - char **output, int *output_len); + const char *input, int input_len, + char **output, int *output_len); #if HAVE_USEMARCON CDetails *m_stage1; CDetails *m_stage2; @@ -58,16 +59,21 @@ public: ~Yaz_CharsetConverter(); void set_target_query_charset(const char *s); void set_client_query_charset(const char *org); + const char *get_client_query_charset(void); + const char *get_target_query_charset(void); void convert_type_1(Z_RPNQuery *q, ODR o); + void set_client_charset_selected(int sel); + int get_client_charset_selected(); private: void convert_type_1(char *buf_in, int len_in, - char **buf_out, int *len_out, - ODR o); + char **buf_out, int *len_out, + ODR o); void convert_type_1(Z_Term *q, ODR o); void convert_type_1(Z_RPNStructure *q, ODR o); void convert_type_1(Z_Operand *q, ODR o); char *m_target_query_charset; char *m_client_query_charset; + int m_client_charset_selected; yaz_iconv_t m_ct; WRBUF m_wrbuf; }; @@ -79,93 +85,75 @@ public: int read_xml(const char *fname); 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 **authentication, - const char **negotiation_charset, - const char **negotiation_lang, - const char **query_charset); - + const char **name, + const char **url, + int *limit_bw, + int *limit_pdu, + int *limit_req, + int *limit_search, + int *limit_connect, + 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 **authentication, + const char **negotiation_charset, + const char **negotiation_lang, + const char **query_charset, + const char **default_client_query_charset); + 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, - int *keepalive_limit_bw, int *keepalive_limit_pdu, - int *pre_init, - const char **cql2rpn, - const char **negotiation_charset, - const char **negotiation_lang, - const char **query_charset); + int *limit_bw, int *limit_pdu, int *limit_req, + int *limit_search, int *limit_connect, + 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 **negotiation_charset, + const char **negotiation_lang, + const char **query_charset, + const char **default_client_query_charset); const char *check_mime_type(const char *path); int check_query(ODR odr, const char *name, Z_Query *query, char **addinfo); int check_syntax(ODR odr, const char *name, - Odr_oid *syntax, Z_RecordComposition *comp, - char **addinfo, char **stylesheet, char **schema, - char **backend_type, char **backend_charset, - char **usemarcon_ini_stage1, char **usemarcon_ini_stage2); + Odr_oid *syntax, Z_RecordComposition *comp, + char **addinfo, char **stylesheet, char **schema, + char **backend_type, char **backend_charset, + char **usemarcon_ini_stage1, char **usemarcon_ini_stage2); void target_authentication(const char *name, - ODR odr, - Z_InitRequest *req); + ODR odr, + Z_InitRequest *req); int client_authentication(const char *name, - const char *user, const char *group, - const char *password); + const char *user, const char *group, + const char *password, + const char *peer_IP); char *get_explain_doc(ODR odr, const char *name, const char *db, - int *len); + int *len); const char *get_explain_name(const char *db, const char **backend_db); private: void operator=(const Yaz_ProxyConfig &conf); class Yaz_ProxyConfigP *m_cp; }; -class Yaz_RecordCache { - public: - Yaz_RecordCache (); - ~Yaz_RecordCache (); - void add (ODR o, Z_NamePlusRecordList *npr, int start, int hits); - - int lookup (ODR o, Z_NamePlusRecordList **npr, int start, int num, - Odr_oid *syntax, Z_RecordComposition *comp); - void clear(); - - 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; - Z_SearchRequest *m_searchRequest; - Z_PresentRequest *m_presentRequest; - int match (Yaz_RecordCache_Entry *entry, - Odr_oid *syntax, int offset, - Z_RecordComposition *comp); - int m_max_size; -}; - -class Yaz_ProxyClient : public Yaz_Z_Assoc { +class Yaz_ProxyClient : public yazpp_1::Z_Assoc { friend class Yaz_Proxy; - Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable, - Yaz_Proxy *parent); + Yaz_ProxyClient(yazpp_1::IPDU_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); + IPDU_Observer* sessionNotify + (yazpp_1::IPDU_Observable *the_PDU_Observable, int fd); void shutdown(); Yaz_Proxy *m_server; void failNotify(); @@ -177,8 +165,8 @@ class Yaz_ProxyClient : public Yaz_Z_Assoc { Yaz_ProxyClient *m_next; Yaz_ProxyClient **m_prev; int m_init_flag; - Yaz_Z_Query *m_last_query; - Yaz_Z_Databases m_last_databases; + yazpp_1::Yaz_Z_Query *m_last_query; + yazpp_1::Yaz_Z_Databases m_last_databases; char *m_last_resultSetId; int m_last_ok; int m_last_resultCount; @@ -195,9 +183,23 @@ class Yaz_ProxyClient : public Yaz_Z_Assoc { Z_ProtocolVersion *m_initResponse_version; int m_initResponse_preferredMessageSize; int m_initResponse_maximumRecordSize; - Yaz_RecordCache m_cache; + yazpp_1::RecordCache m_cache; void pre_init_client(); int m_target_idletime; Yaz_Proxy *m_root; + char *m_idAuthentication_ber_buf; + int m_idAuthentication_ber_size; + ODR m_idAuthentication_odr; + void set_idAuthentication(Z_APDU *apdu); + bool compare_idAuthentication(Z_APDU *apdu); + bool compare_charset(Z_APDU *apdu); }; +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +