Use HTTP header X-Forwarded-For as IP for blocking if available (for

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

diff --git a/include/yazproxy/proxy.h b/include/yazproxy/proxy.h
index fb470cb..5f015fe 100644 (file)
--- a/include/yazproxy/proxy.h
+++ b/include/yazproxy/proxy.h
@@ -1,7 +1,7 @@
-/* $Id: proxy.h,v 1.28 2006-03-29 13:33:46 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
 
 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

@@ -31,6 +31,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yazpp/gdu.h>
 #include <yazpp/gduqueue.h>
 #include <yazproxy/bw.h>
 #include <yazpp/gdu.h>
 #include <yazpp/gduqueue.h>
 #include <yazproxy/bw.h>

+#include <yazproxy/limit-connect.h>

 
 class Yaz_Proxy;
 
 
 class Yaz_Proxy;
 

@@ -40,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_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;
 
 class Yaz_usemarcon;
 class Yaz_ProxyConfig;

@@ -48,7 +50,7 @@ class Yaz_CharsetConverter;
 
 enum YAZ_Proxy_MARCXML_mode {
     none,
 
 enum YAZ_Proxy_MARCXML_mode {
     none,

-    marcxml,
+    marcxml

 };
 
 class Msg_Thread;
 };
 
 class Msg_Thread;

@@ -64,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);
     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);
     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);

@@ -90,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
     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;
     Yaz_ProxyConfig *m_config;
     char *m_config_fname;
     int m_bytes_sent;

@@ -105,12 +109,17 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Z_Assoc {
         timeout_xsl
     } m_timeout_mode;
 
         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;
     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,
     void handle_max_record_retrieve(Z_APDU *apdu);
     void display_diagrecs(Z_DiagRec **pp, int num);
     Z_Records *create_nonSurrogateDiagnostics(ODR o, int error,

@@ -197,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;
     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,
  public:
     Yaz_Proxy(yazpp_1::IPDU_Observable *the_PDU_Observable,
               yazpp_1::ISocketObservable *the_socket_observable,