Reconstructed release dates in ChangeLog

[libt2n] / src / server.hxx

diff --git a/src/server.hxx b/src/server.hxx
index aca705b..738a869 100644 (file)
--- a/src/server.hxx
+++ b/src/server.hxx
@@ -60,6 +60,7 @@ class server_connection : public connection
         server *my_server;
 
         server_connection(int _timeout);
+        virtual ~server_connection();
 
         std::ostream* get_logstream(log_level_values level);
 
@@ -72,6 +73,8 @@ class server_connection : public connection
         /// get the id of this connection within the server object
         unsigned int get_id()
             { return connection_id; }
+
+        void add_callback(callback_event_type event, const boost::function<void ()>& func);
 };
 
 /**
@@ -87,7 +90,7 @@ class server
         std::ostream *logstream;
 
         /// vector initialized for all callback-types, all elements in each list will be called
-        std::vector<std::list<boost::function<void (server_connection*)> > > callbacks;
+        std::vector<std::list<boost::function<void (unsigned int)> > > callbacks;
 
         unsigned int next_id;
 
@@ -98,9 +101,9 @@ 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, server_connection* conn);
+        void do_callbacks(callback_event_type event, unsigned int conn_id);
 
     public:
         virtual ~server();
@@ -117,16 +120,20 @@ class server
 
         server_connection* get_connection(unsigned int conn_id);
 
-        void add_callback(callback_event_type event, const boost::function<void (server_connection*)>& func);
+        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();