Replace socket_handler::fill_buffer() recursion with loop (#8389)

[libt2n] / src / client.cpp

diff --git a/src/client.cpp b/src/client.cpp
index 96b2554..129c45f 100644 (file)
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1,22 +1,24 @@
-/***************************************************************************
- *   Copyright (C) 2006 by Gerd v. Egidy                                   *
- *   gve@intra2net.com                                                     *
- *                                                                         *
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU Lesser General Public License for more details.                   *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this program; if not, write to the                 *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
+/*
+Copyright (C) 2006 by Intra2net AG - Gerd v. Egidy
 
+The software in this package is distributed under the GNU General
+Public License version 2 (with a special exception described below).
+
+A copy of GNU General Public License (GPL) is included in this distribution,
+in the file COPYING.GPL.
+
+As a special exception, if other files instantiate templates or use macros
+or inline functions from this file, or you compile this file and link it
+with other works to produce a work based on this file, this file
+does not by itself cause the resulting work to be covered
+by the GNU General Public License.
+
+However the source code for this file must still be made available
+in accordance with section (3) of the GNU General Public License.
+
+This exception does not invalidate any other reasons why a work based
+on this file might be covered by the GNU General Public License.
+*/
 #include <sstream>
 
 #include "client.hxx"
@@ -25,49 +27,11 @@ namespace libt2n
 {
 
 client_connection::client_connection()
-    : connection(), callbacks(__events_end)
+    : connection()
 {
     set_logging(NULL,none);
 }
 
-client_connection::~client_connection()
-{
-    // we want the connection_closed callbacks to be called before
-    close();
-
-    do_callbacks(connection_deleted);
-}
-
-void client_connection::close()
-{
-    if (!is_closed())
-    {
-        connection::close();
-        do_callbacks(connection_closed);
-    }
-}
-
-/** @brief add a callback
-
-    @param event event the function will be called at
-    @param func functor (see boost function) that will be called
-
-    @example use boost::bind to bind to member functions and parameters like this:
-        int this example 17 is a fixed parameter that is always added to the call
-        c.add_callback(connection_closed,bind(&my_class::func_to_call_back, boost::ref(*this), 17));
-*/
-void client_connection::add_callback(callback_event_type event, const boost::function<void ()>& func)
-{
-    callbacks[event].push_back(func);
-}
-
-void client_connection::do_callbacks(callback_event_type event)
-{
-    std::list<boost::function<void ()> >::iterator i,ie=callbacks[event].end();
-    for (i=callbacks[event].begin(); i != ie; i++)
-        (*i)();
-}
-
 /// get pointer to logging stream, returns NULL if no logging needed
 std::ostream* client_connection::get_logstream(log_level_values level)
 {