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

diff --git a/src/server.cpp b/src/server.cpp
index 14f4e2a..65ce62f 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -18,6 +18,10 @@
  ***************************************************************************/
 
 #include <sstream>
+#include <stdexcept>
+#include <time.h>
+
+#include <boost/bind.hpp>
 
 #include "server.hxx"
 #include "log.hxx"
@@ -34,12 +38,18 @@ server_connection::server_connection(int _timeout)
     my_server=0;
 }
 
-
 /// get pointer to logging stream, returns NULL if no logging needed
 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
@@ -58,7 +68,16 @@ void server_connection::reset_timeout()
     last_action_time=time(NULL);
 }
 
+void server_connection::add_callback(callback_event_type event, const boost::function<void ()>& func)
+{
+    if (event == new_connection)
+        throw std::logic_error("new_connection callback not allowed for server_connections");
+
+    connection::add_callback(event,func);
+}
+
 server::server()
+    : callbacks(__events_end)
 {
     set_default_timeout(30);
     set_logging(NULL,none);
@@ -72,6 +91,34 @@ 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
+
+    @note use boost::bind to bind to member functions like this:
+        s.add_callback(new_connection,bind(&my_class::func_to_call_back, boost::ref(*this), _1));
+*/
+void server::add_callback(callback_event_type event, const boost::function<void (unsigned int)>& func)
+{
+    callbacks[event].push_back(func);
+
+    // add callback to all existing connections
+    if (event != new_connection)
+    {
+        std::map<unsigned int, server_connection*>::iterator ie=connections.end();
+        for(std::map<unsigned int, server_connection*>::iterator i=connections.begin(); i != ie; i++)
+            i->second->add_callback(event,bind(func, i->first));
+    }
+}
+
+void server::do_callbacks(callback_event_type event, unsigned int conn_id)
+{
+    std::list<boost::function<void (unsigned int)> >::iterator i,ie=callbacks[event].end();
+    for (i=callbacks[event].begin(); i != ie; i++)
+        (*i)(conn_id);
+}
+
 int server::add_connection(server_connection* newconn)
 {
     unsigned int cid=next_id++;
@@ -79,8 +126,18 @@ int server::add_connection(server_connection* newconn)
     newconn->set_server(this);
     connections[cid]=newconn;
 
+    // add all callbacks except new_connection
+    for(int e=connection_closed; e != __events_end; e++)
+    {
+        std::list<boost::function<void (unsigned int)> >::iterator i,ie=callbacks[e].end();
+        for (i=callbacks[e].begin(); i != ie; i++)
+            newconn->add_callback(static_cast<callback_event_type>(e),bind(*i,cid));
+    }
+
     LOGSTREAM(debug,"new connection accepted, id: " << cid);
 
+    do_callbacks(new_connection,cid);
+
     return cid;
 }
 
@@ -119,7 +176,7 @@ void server::cleanup()
         if (i->second->is_closed() && !i->second->packet_available())
         {
             // closed and no usable data in buffer -> remove
-            LOGSTREAM(debug,"removing conneciton " << i->first << " because it is closed and no more data waiting");
+            LOGSTREAM(debug,"removing connection " << i->first << " because it is closed and no more data waiting");
 
             delete i->second;
             connections.erase(i);
@@ -158,7 +215,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;
 }
 };