X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=include%2Fyazproxy%2Fproxy.h;h=b44b42ba3304fd1e10cfaf08f1b01d13ee64a272;hp=5a6ae44c5e9c547a71a93c39c7b38f308fba20fb;hb=dfdff5f2d2825a500d3d27200d2ec32ee063a975;hpb=36388cfc9c49bf00dfbb3cc9932504a77af9b6f2

diff --git a/include/yazproxy/proxy.h b/include/yazproxy/proxy.h
index 5a6ae44..b44b42b 100644
--- a/include/yazproxy/proxy.h
+++ b/include/yazproxy/proxy.h
@@ -1,7 +1,5 @@
-/* $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.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2009 Index Data
 
 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
@@ -14,23 +12,23 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #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 <yaz++/gduqueue.h>
+#include <yazpp/gdu.h>
+#include <yazpp/gduqueue.h>
 #include <yazproxy/bw.h>
+#include <yazproxy/limit-connect.h>
 
 class Yaz_Proxy;
 
@@ -40,6 +38,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;
@@ -48,7 +47,7 @@ class Yaz_CharsetConverter;
 
 enum YAZ_Proxy_MARCXML_mode {
     none,
-    marcxml,
+    marcxml
 };
 
 class Msg_Thread;
@@ -64,9 +63,12 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Z_Assoc {
     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);
+                                const char *proxy_host, int *http_code);
     void srw_get_client(const char *db, const char **backend_db);
+    int get_number_of_connections();
     Z_APDU *result_set_optimize(Z_APDU *apdu);
     void releaseClient();
     Yaz_ProxyClient *m_client;
@@ -81,6 +83,7 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Z_Assoc {
     int m_keepalive_limit_pdu;
     int m_client_idletime;
     int m_target_idletime;
+    int m_max_sockets;
     int m_debug_mode;
     char *m_proxyTarget;
     char *m_default_target;
@@ -90,7 +93,7 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Z_Assoc {
     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;
@@ -105,12 +108,17 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Z_Assoc {
         timeout_xsl
     } m_timeout_mode;
 
-    int m_connect_max;
+    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;
     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,
@@ -137,7 +145,7 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Z_Assoc {
     char *m_schema;
     char *m_backend_type;
     char *m_backend_charset;
-    int m_frontend_type;
+    Odr_oid m_frontend_type[OID_SIZE];
     void convert_to_frontend_type(Z_NamePlusRecordList *p);
     void convert_to_marcxml(Z_NamePlusRecordList *p, const char *charset);
     void convert_records_charset(Z_NamePlusRecordList *p, const char *charset);
@@ -197,18 +205,18 @@ 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,
               Yaz_Proxy *parent = 0);
     ~Yaz_Proxy();
 
-
     void inc_ref();
-    bool dec_ref(bool main_ptr);
-
+    bool dec_ref();
 
     int handle_authentication(Z_APDU *apdu);
+    int handle_global_authentication(Z_APDU *apdu);
     void result_authentication(Z_APDU *apdu, int ret);
     void handle_init(Z_APDU *apdu);
     void inc_request_no();
@@ -245,6 +253,7 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Z_Assoc {
     int handle_init_response_for_invalid_session(Z_APDU *apdu);
     void set_debug_mode(int mode);
     void send_response_fail_client(const char *addr);
+    int m_num_msg_threads;
     Msg_Thread *m_my_thread;
     void base64_decode(const char *base64, char *buf, int buf_len);
 };
@@ -253,6 +262,7 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Z_Assoc {
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab