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

diff --git a/src/server.cpp b/src/server.cpp
index 6bc1cba..65ce62f 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -18,18 +18,19 @@
  ***************************************************************************/
 
 #include <sstream>
+#include <stdexcept>
+#include <time.h>
 
 #include <boost/bind.hpp>
 
 #include "server.hxx"
 #include "log.hxx"
-#include "t2n_exception.hxx"
 
 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,12 @@ void server_connection::reset_timeout()
     last_action_time=time(NULL);
 }
 
-/** @brief add a callback
-
-    @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));
-*/
 void server_connection::add_callback(callback_event_type event, const boost::function<void ()>& func)
 {
     if (event == new_connection)
-        throw t2n_parameter_error("new_connection callback not allowed for server_connections");
+        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()
@@ -128,7 +96,7 @@ server::~server()
     @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 like this:
+    @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)
@@ -158,7 +126,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();
@@ -208,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);