Applied Ere's global client-authentication patch.

[yazproxy-moved-to-github.git] / include / yazproxy / proxy.h

diff --git a/include/yazproxy/proxy.h b/include/yazproxy/proxy.h
index fe0f2df..2f9c588 100644 (file)
--- a/include/yazproxy/proxy.h
+++ b/include/yazproxy/proxy.h
@@ -1,4 +1,4 @@
-/* $Id: proxy.h,v 1.29 2006-03-30 10:35:15 adam Exp $
+/* $Id: proxy.h,v 1.37 2006-06-28 23:38:23 adam Exp $
    Copyright (c) 1998-2006, Index Data.
 
 This file is part of the yazproxy.
@@ -41,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;
@@ -49,7 +50,7 @@ class Yaz_CharsetConverter;
 
 enum YAZ_Proxy_MARCXML_mode {
     none,
-    marcxml,
+    marcxml
 };
 
 class Msg_Thread;
@@ -65,6 +66,8 @@ 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);
     void srw_get_client(const char *db, const char **backend_db);
@@ -91,7 +94,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;
@@ -106,12 +109,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,
@@ -205,12 +213,11 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Z_Assoc {
               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();
@@ -247,6 +254,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);
 };