X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fserver.cpp;h=30bf7d3359a482fb4b1e26525e8c2ebbb12ba107;hp=a49bc7a31fa890f9b91bcf1afa0b26b2f017ce01;hb=238ad35f4e3b6516d4ba7611b540a0edeea71427;hpb=38de59c2572658f738030390f2280f86a19f000b

diff --git a/src/server.cpp b/src/server.cpp
index a49bc7a..30bf7d3 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -19,6 +19,7 @@
 
 #include <sstream>
 #include <stdexcept>
+#include <time.h>
 
 #include <boost/bind.hpp>
 
@@ -29,7 +30,7 @@ namespace libt2n
 {
 
 server_connection::server_connection(int _timeout)
-    : connection(), callbacks(__events_end)
+    : connection()
 {
     set_timeout(_timeout);
     reset_timeout();
@@ -37,23 +38,6 @@ server_connection::server_connection(int _timeout)
     my_server=0;
 }
 
-server_connection::~server_connection()
-{
-    // we want the connection_closed callbacks to be called before
-    close();
-
-    do_callbacks(connection_deleted);
-}
-
-void server_connection::close()
-{
-    if (!is_closed())
-    {
-        connection::close();
-        do_callbacks(connection_closed);
-    }
-}
-
 /// get pointer to logging stream, returns NULL if no logging needed
 std::ostream* server_connection::get_logstream(log_level_values level)
 {
@@ -84,28 +68,17 @@ void server_connection::reset_timeout()
     last_action_time=time(NULL);
 }
 
-/** @brief add a callback
+/** @brief add a callback to one connection
 
     @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 and parameters like this:
-        17 is a fixed parameter that is always added to the call
-        c.add_callback(connection_closed,bind(&my_class::func_to_call_back, boost::ref(*this), 17));
+    @param func functor (see boost::function) that will be called
 */
 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");
 
-    callbacks[event].push_back(func);
-}
-
-void server_connection::do_callbacks(callback_event_type event)
-{
-    std::list<boost::function<void ()> >::iterator i,ie=callbacks[event].end();
-    for (i=callbacks[event].begin(); i != ie; i++)
-        (*i)();
+    connection::add_callback(event,func);
 }
 
 server::server()
@@ -126,10 +99,10 @@ server::~server()
 /** @brief add a callback
 
     @param event event the function will be called at
-    @param func functor (see boost function) that will be called
+    @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));
+        s.add_callback(new_connection,boost::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)
 {
@@ -140,10 +113,16 @@ void server::add_callback(callback_event_type event, const boost::function<void
     {
         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));
+            i->second->add_callback(event,boost::bind(func, i->first));
     }
 }
 
+
+/** @brief an event occured, call all server-side callbacks
+
+    @param event event that occured
+    @param conn_id connection-id parameter that will be given to the callback-function
+*/
 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();
@@ -151,6 +130,7 @@ void server::do_callbacks(callback_event_type event, unsigned int conn_id)
         (*i)(conn_id);
 }
 
+/// add a new connection to the server
 int server::add_connection(server_connection* newconn)
 {
     unsigned int cid=next_id++;
@@ -158,7 +138,7 @@ int server::add_connection(server_connection* newconn)
     newconn->set_server(this);
     connections[cid]=newconn;
 
-    // add all callbacks
+    // 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();