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

diff --git a/src/server.hxx b/src/server.hxx
index 786770f..684cee8 100644
--- a/src/server.hxx
+++ b/src/server.hxx
@@ -22,6 +22,10 @@
 #include <iostream>
 #include <string>
 #include <map>
+#include <vector>
+#include <list>
+
+#include <boost/function.hpp>
 
 #include "connection.hxx"
 #include "types.hxx"
@@ -53,30 +57,23 @@ class server_connection : public connection
             { connection_id=_connection_id; }
 
     protected:
-        server_connection(int _timeout)
-            : connection()
-        {
-            set_timeout(_timeout);
-            reset_timeout();
-            connection_id=0;
-            my_server=0;
-        }
-
         server *my_server;
 
+        server_connection(int _timeout);
+
+        std::ostream* get_logstream(log_level_values level);
+
     public:
-        /// check if timeout is expired, close connection if so
         void check_timeout();
-
-        /// reset the timeout, e.g. if something is received
         void reset_timeout();
-
         void set_timeout(int _timeout)
             { timeout=_timeout; }
 
         /// 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);
 };
 
 /**
@@ -91,22 +88,22 @@ class server
         log_level_values log_level;
         std::ostream *logstream;
 
+        /// vector initialized for all callback-types, all elements in each list will be called
+        std::vector<std::list<boost::function<void (unsigned int)> > > callbacks;
+
         unsigned int next_id;
 
     protected:
         std::map<unsigned int, server_connection*> connections;
 
-        server()
-        {
-            set_default_timeout(30);
-            set_logging(NULL,none);
-            next_id=1;
-        }
+        server();
 
         virtual bool fill_connection_buffers(void)=0;
 
         int add_connection(server_connection* newconn);
 
+        void do_callbacks(callback_event_type event, unsigned int conn_id);
+
     public:
         virtual ~server();
 
@@ -118,23 +115,22 @@ class server
         int get_default_timeout(void)
             { return default_timeout; }
 
-        /// activate logging to the given stream. everything above the given level is logged.
-        void set_logging(std::ostream *_logstream, log_level_values _log_level)
-        {
-            log_level=_log_level;
-            logstream=_logstream;
-        }
+        void set_logging(std::ostream *_logstream, log_level_values _log_level);
 
         server_connection* get_connection(unsigned int conn_id);
 
-        /** @brief look for new data on all open connections, accept new connections
+        void add_callback(callback_event_type event, const boost::function<void (unsigned int)>& func);
+
+        /** @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();
 
@@ -146,19 +142,9 @@ class server
         bool get_packet(std::string& data)
             { unsigned int x; return get_packet(data,x); }
 
-        /** @brief get a complete data packet from any client. The packet is removed from the
-                   connection buffer.
-            @param[out] data the data package
-            @param[out] conn_id the connection id we got this packet from
-            @retval true if packet found
-        */
         bool get_packet(std::string& data, unsigned int& conn_id);
 
-        /// write a message to the log if logging is enabled
-        void log(log_level_values level, const std::string& message)
-            { log(level,message.c_str()); }
-        /// write a message to the log if logging is enabled
-        void log(log_level_values level, const char* message);
+        std::ostream* get_logstream(log_level_values level);
 };
 
 }