-/* $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.29 2006-03-30 10:35:15 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
#ifndef YAZ_PROXY_H_INCLUDED
#define YAZ_PROXY_H_INCLUDED
-#include <yaz++/socket-observer.h>
-#include <yaz++/z-assoc.h>
-#include <yaz++/z-query.h>
-#include <yaz++/z-databases.h>
-#include <yaz++/cql2rpn.h>
+#include <yazpp/socket-observer.h>
+#include <yazpp/z-assoc.h>
+#include <yazpp/z-query.h>
+#include <yazpp/z-databases.h>
+#include <yazpp/cql2rpn.h>
#include <yaz/cql.h>
-#include <yaz++/gdu.h>
+#include <yazpp/gdu.h>
+#include <yazpp/gduqueue.h>
#include <yazproxy/bw.h>
+#include <yazproxy/limit-connect.h>
class Yaz_Proxy;
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,
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;
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
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);
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;
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,
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();
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,
void inc_ref();
- bool dec_ref();
+ bool dec_ref(bool main_ptr);
int handle_authentication(Z_APDU *apdu);
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);
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; };
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