From: Adam Dickmeiss Date: Mon, 29 Jun 2009 15:19:13 +0000 (+0200) Subject: New class yazpp::LimitConnect (from YAZ Proxy) X-Git-Tag: v1.1.3~4 X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=commitdiff_plain;h=660f5e8b270182001d931f65fa03ff95819c3b92 New class yazpp::LimitConnect (from YAZ Proxy) --- diff --git a/include/yazpp/Makefile.am b/include/yazpp/Makefile.am index 4a90c8c..9b76856 100644 --- a/include/yazpp/Makefile.am +++ b/include/yazpp/Makefile.am @@ -4,6 +4,7 @@ pkginclude_HEADERS = \ gdu.h \ gduqueue.h \ ir-assoc.h \ + limit-connect.h \ pdu-assoc.h \ pdu-observer.h \ query.h \ diff --git a/include/yazpp/bw.h b/include/yazpp/bw.h index 31fa58e..56dcae0 100644 --- a/include/yazpp/bw.h +++ b/include/yazpp/bw.h @@ -29,8 +29,10 @@ #ifndef YAZPP_BW_H #define YAZPP_BW_H +#include + namespace yazpp_1 { - class Yaz_bw { + class YAZ_EXPORT Yaz_bw { public: Yaz_bw(int sz); ~Yaz_bw(); diff --git a/include/yazpp/limit-connect.h b/include/yazpp/limit-connect.h new file mode 100644 index 0000000..5ab55f9 --- /dev/null +++ b/include/yazpp/limit-connect.h @@ -0,0 +1,62 @@ +/* This file is part of the yazpp toolkit. + * Copyright (C) 1998-2009 Index Data and Mike Taylor + * All rights reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Index Data nor the names of its contributors + * may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef YAZPP_LIMIT_CONNECT_H +#define YAZPP_LIMIT_CONNECT_H + +#include +#include + +namespace yazpp_1 { + class YAZ_EXPORT LimitConnect { + public: + LimitConnect(); + ~LimitConnect(); + void add_connect(const char *peername); + int get_total(const char *peername); + void cleanup(bool all); + void set_period(int sec); + private: + struct Peer; + + int m_period; + Peer *m_peers; + Peer **lookup(const char *peername); + }; +} + +#endif + +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ + diff --git a/src/Makefile.am b/src/Makefile.am index 500c1d9..14e145c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,8 +18,8 @@ libyazpp_la_SOURCES=socket-observer.cpp pdu-observer.cpp query.cpp \ yaz-z-assoc.cpp yaz-z-query.cpp yaz-ir-assoc.cpp \ yaz-z-server.cpp yaz-pdu-assoc-thread.cpp yaz-z-server-sr.cpp \ yaz-z-server-ill.cpp yaz-z-server-update.cpp yaz-z-databases.cpp \ - yaz-z-cache.cpp yaz-cql2rpn.cpp gdu.cpp gduqueue.cpp bw.cpp - + yaz-z-cache.cpp yaz-cql2rpn.cpp gdu.cpp gduqueue.cpp \ + bw.cpp limit-connect.cpp yaz_my_client_SOURCES=yaz-my-client.cpp diff --git a/src/limit-connect.cpp b/src/limit-connect.cpp new file mode 100644 index 0000000..3b63759 --- /dev/null +++ b/src/limit-connect.cpp @@ -0,0 +1,133 @@ +/* This file is part of the yazpp toolkit. + * Copyright (C) 1998-2009 Index Data and Mike Taylor + * All rights reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Index Data nor the names of its contributors + * may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include + +#include +#include +#include + +using namespace yazpp_1; + +struct LimitConnect::Peer { + friend class LimitConnect; + + Peer(int sz, const char *peername); + ~Peer(); + void add_connect(); + + char *m_peername; + Yaz_bw m_bw; + Peer *m_next; +}; + +LimitConnect::LimitConnect() +{ + m_period = 60; + m_peers = 0; +} + + +LimitConnect::~LimitConnect() +{ + cleanup(true); +} + +void LimitConnect::set_period(int sec) +{ + m_period = sec; +} + +LimitConnect::Peer::Peer(int sz, const char *peername) : m_bw(sz) +{ + m_peername = xstrdup(peername); + m_next = 0; +} + +LimitConnect::Peer::~Peer() +{ + xfree(m_peername); +} + +void LimitConnect::Peer::add_connect() +{ + m_bw.add_bytes(1); +} + +LimitConnect::Peer **LimitConnect::lookup(const char *peername) +{ + Peer **p = &m_peers; + while (*p) + { + if (!strcmp((*p)->m_peername, peername)) + break; + p = &(*p)->m_next; + } + return p; +} + +void LimitConnect::add_connect(const char *peername) +{ + Peer **p = lookup(peername); + if (!*p) + *p = new Peer(m_period, peername); + (*p)->add_connect(); +} + +int LimitConnect::get_total(const char *peername) +{ + Peer **p = lookup(peername); + if (!*p) + return 0; + return (*p)->m_bw.get_total(); +} + +void LimitConnect::cleanup(bool all) +{ + Peer **p = &m_peers; + while (*p) + { + Peer *tp = *p; + if (all || (tp->m_bw.get_total() == 0)) + { + *p = tp->m_next; + delete tp; + } + else + p = &tp->m_next; + } +} + +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ + diff --git a/win/makefile b/win/makefile index 8c74e65..b88fbee 100644 --- a/win/makefile +++ b/win/makefile @@ -142,6 +142,7 @@ DLL_OBJS = \ "$(OBJDIR)\bw.obj" \ "$(OBJDIR)\gdu.obj" \ "$(OBJDIR)\gduqueue.obj" \ + "$(OBJDIR)\limit-connect.obj" \ "$(OBJDIR)\pdu-observer.obj" \ "$(OBJDIR)\query.obj" \ "$(OBJDIR)\socket-observer.obj" \