libt2n: (tomj) make result_container's has_exception and has_result a bit more robust

[libt2n] / src / server.hxx

diff --git a/src/server.hxx b/src/server.hxx
index f3ace10..738a869 100644 (file)
--- a/src/server.hxx
+++ b/src/server.hxx
@@ -56,21 +56,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 +74,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 +101,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);
 
@@ -139,7 +131,9 @@ class server
             @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, long long* timeout_remaining=NULL)=0;
+        virtual bool fill_buffer(long long usec_timeout=-1, long long* usec_timeout_remaining=NULL)=0;
+
+        void close();
 
         void cleanup();