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

diff --git a/src/server.cpp b/src/server.cpp
index 20cce1e..b1f7962 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -20,21 +20,59 @@
 #include <sstream>
 
 #include "server.hxx"
+#include "log.hxx"
 
 namespace libt2n
 {
 
+server_connection::server_connection(int _timeout)
+    : connection()
+{
+    set_timeout(_timeout);
+    reset_timeout();
+    connection_id=0;
+    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)
+    {
+        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
 void server_connection::check_timeout()
 {
-    if (timeout != -1 && last_action_time+timeout >= time(NULL))
+    if (timeout != -1 && last_action_time+timeout < time(NULL))
+    {
+        LOGSTREAM(debug,"timeout on connection " << connection_id << ", closing");
         this->close();
+    }
 }
 
+/// reset the timeout, e.g. if something is received
 void server_connection::reset_timeout()
 {
     last_action_time=time(NULL);
 }
 
+server::server()
+    : callbacks(__events_end)
+{
+    set_default_timeout(30);
+    set_logging(NULL,none);
+    next_id=1;
+}
+
 server::~server()
 {
     std::map<unsigned int, server_connection*>::iterator ie=connections.end();
@@ -42,15 +80,44 @@ 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++;
     newconn->set_id(cid);
     newconn->set_server(this);
     connections[cid]=newconn;
+
+    LOGSTREAM(debug,"new connection accepted, id: " << cid);
+
+    do_callbacks(new_connection,newconn);
+
     return cid;
 }
 
+/// activate logging to the given stream. everything above the given level is logged.
+void server::set_logging(std::ostream *_logstream, log_level_values _log_level)
+{
+    log_level=_log_level;
+    logstream=_logstream;
+}
+
 /**
     @brief Gets a connection by id
     
@@ -79,6 +146,8 @@ 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");
+
             delete i->second;
             connections.erase(i);
             i=connections.begin();
@@ -89,6 +158,12 @@ void server::cleanup()
     }
 }
 
+/** @brief get a complete data packet from any client. The packet is removed from the
+            connection buffer.
+    @param[out] data the data package
+    @param[out] conn_id the connection id we got this packet from
+    @retval true if packet found
+*/
 bool server::get_packet(std::string& data, unsigned int& conn_id)
 {
     // todo: this is somehow unfair: the first connections in the map get checked more
@@ -98,6 +173,8 @@ bool server::get_packet(std::string& data, unsigned int& conn_id)
     for(std::map<unsigned int, server_connection*>::iterator i=connections.begin(); i != ie; i++)
         if (i->second->get_packet(data))
         {
+            LOGSTREAM(debug,"got packet (" << data.size() << " bytes) from connection " << i->first);
+
             conn_id=i->first;
             return true;
         }
@@ -105,10 +182,12 @@ bool server::get_packet(std::string& data, unsigned int& conn_id)
     return false;
 }
 
-void server::log(log_level_values level, const char* message)
+/// 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)
-        (*logstream) << message << std::endl;
+    if (logstream && log_level >= level)
+        return logstream;
+    else
+        return NULL;
 }
-
 };