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

[libt2n] / src / server.hxx

diff --git a/src/server.hxx b/src/server.hxx
index 601329c..cc3c5dd 100644 (file)
--- a/src/server.hxx
+++ b/src/server.hxx
@@ -1,21 +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.
+*/
 #ifndef __LIBT2N_SERVER
 #define __LIBT2N_SERVER
 
@@ -56,21 +59,15 @@ class server_connection : public connection
         void set_id(unsigned int _connection_id)
             { connection_id=_connection_id; }
 
-        /// vector initialized for all callback-types, all elements in each list will be called
-        std::vector<std::list<boost::function<void ()> > > callbacks;
-
     protected:
         server *my_server;
 
         server_connection(int _timeout);
+        virtual ~server_connection();
 
         std::ostream* get_logstream(log_level_values level);
 
-        void do_callbacks(callback_event_type event);
-
     public:
-        virtual ~server_connection();
-
         void check_timeout();
         void reset_timeout();
         void set_timeout(int _timeout)
@@ -80,8 +77,6 @@ class server_connection : public connection
         unsigned int get_id()
             { return connection_id; }
 
-        void close();
-
         void add_callback(callback_event_type event, const boost::function<void ()>& func);
 };
 
@@ -109,7 +104,7 @@ class server
 
         virtual bool fill_connection_buffers(void)=0;
 
-        int add_connection(server_connection* newconn);
+        unsigned int add_connection(server_connection* newconn);
 
         void do_callbacks(callback_event_type event, unsigned int conn_id);
 
@@ -130,14 +125,18 @@ class server
 
         void add_callback(callback_event_type event, const boost::function<void (unsigned int)>& func);
 
-        /** @brief look for new data on all open connections, accept new connections
+        /** @brief look for new data and store it in the local buffer
             @param usec_timeout wait until new data is found, max timeout usecs.
                   -1: wait endless
-                   NULL: no timeout
+                   0: return instantly
+            @param usec_timeout_remaining if non-NULL the function will write the
+                  not used time to the given target
             @retval true if new data was found (does not mean that the received data 
                     is a complete packet though)
         */
-        virtual bool fill_buffer(long long usec_timeout=-1)=0;
+        virtual bool fill_buffer(long long usec_timeout=-1, long long* usec_timeout_remaining=NULL)=0;
+
+        void close();
 
         void cleanup();