X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fserver.cpp;h=b1f7962f3afaa97c4bfb28e55036a202503403ed;hp=14f4e2afe50a718a8e085dd91a6e21fc0e3aa363;hb=28cb45a5725e9c6054d7048a9bf969b9f2c94d64;hpb=a7170401dd90dc79cc7d7a808cfe18a06c7e983b

diff --git a/src/server.cpp b/src/server.cpp
index 14f4e2a..b1f7962 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -39,7 +39,14 @@ server_connection::server_connection(int _timeout)
 std::ostream* server_connection::get_logstream(log_level_values level)
 {
     if (my_server != NULL)
-        return my_server->get_logstream(level);
+    {
+        std::ostream* ostr=my_server->get_logstream(level);
+        if (ostr != NULL)
+            (*ostr) << "connection " << get_id() << ": ";
+        return ostr;
+    }
+    else
+        return NULL;
 }
 
 /// check if timeout is expired, close connection if so
@@ -59,6 +66,7 @@ void server_connection::reset_timeout()
 }
 
 server::server()
+    : callbacks(__events_end)
 {
     set_default_timeout(30);
     set_logging(NULL,none);
@@ -72,6 +80,23 @@ server::~server()
         delete i->second;
 }
 
+/** @brief add a callback
+
+    @param event event the function will be called at
+    @param func functor (see boost function) that will be called
+*/
+void server::add_callback(callback_event_type event, const boost::function<void (server_connection*)>& func)
+{
+    callbacks[event].push_back(func);
+}
+
+void server::do_callbacks(callback_event_type event, server_connection* conn)
+{
+    std::list<boost::function<void (server_connection*)> >::iterator i,ie=callbacks[event].end();
+    for (i=callbacks[event].begin(); i != ie; i++)
+        (*i)(conn);
+}
+
 int server::add_connection(server_connection* newconn)
 {
     unsigned int cid=next_id++;
@@ -81,6 +106,8 @@ int server::add_connection(server_connection* newconn)
 
     LOGSTREAM(debug,"new connection accepted, id: " << cid);
 
+    do_callbacks(new_connection,newconn);
+
     return cid;
 }
 
@@ -158,7 +185,9 @@ bool server::get_packet(std::string& data, unsigned int& conn_id)
 /// get pointer to logging stream, returns NULL if no logging needed
 std::ostream* server::get_logstream(log_level_values level)
 {
-    if (logstream && level >= log_level)
+    if (logstream && log_level >= level)
         return logstream;
+    else
+        return NULL;
 }
 };