X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fserver.hxx;h=684cee8ac9b2c693c47c88fa9787e180a936c29b;hp=aca705bbf375b8f61b03f8f0bee0eaac5d084623;hb=9a5d7790b094439b9a6f16983e20493c0e43ee02;hpb=28cb45a5725e9c6054d7048a9bf969b9f2c94d64

diff --git a/src/server.hxx b/src/server.hxx
index aca705b..684cee8 100644
--- a/src/server.hxx
+++ b/src/server.hxx
@@ -72,6 +72,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 +89,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;
 
@@ -100,7 +102,7 @@ class server
 
         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 +119,18 @@ 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 cleanup();