X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fserver.cpp;h=749f4fb2ff20e4d294d58e2bb1bb692d56e5be39;hp=331bfc3c48fe860939a67b66d2eb27eea4670777;hb=56f3994d74dbc36d10bfa83b50b016bf269ac563;hpb=04d86ba4ad4f14ab08f38804e772ec46a8ac92b0

diff --git a/src/server.cpp b/src/server.cpp
index 331bfc3..749f4fb 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,29 +30,19 @@ namespace libt2n
 {
 
 server_connection::server_connection(int _timeout)
-    : connection(), callbacks(__events_end)
+    : connection_id(0)
+    , my_server(NULL)
+    , connection()
 {
     set_timeout(_timeout);
     reset_timeout();
-    connection_id=0;
-    my_server=0;
 }
 
+/**
+ * Destructor
+ */
 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
@@ -84,28 +75,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
-
-    @example 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()
@@ -121,15 +101,27 @@ server::~server()
     std::map<unsigned int, server_connection*>::iterator ie=connections.end();
     for(std::map<unsigned int, server_connection*>::iterator i=connections.begin(); i != ie; i++)
         delete i->second;
+
+    connections.clear();
+}
+
+/**
+ * Close all open connections
+ */
+void server::close()
+{
+    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->close();
 }
 
 /** @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
 
-    @example 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));
+    @note use boost::bind to bind to member functions like this:
+        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 +132,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,14 +149,15 @@ void server::do_callbacks(callback_event_type event, unsigned int conn_id)
         (*i)(conn_id);
 }
 
-int server::add_connection(server_connection* newconn)
+/// add a new connection to the server
+unsigned int server::add_connection(server_connection* newconn)
 {
     unsigned int cid=next_id++;
     newconn->set_id(cid);
     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();
@@ -208,7 +207,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);