libt2n: (gerd) fixes, new logging concept (not working yet)

[libt2n] / src / server.cpp

diff --git a/src/server.cpp b/src/server.cpp
index 20cce1e..14f4e2a 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -20,21 +20,51 @@
 #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)
+        return my_server->get_logstream(level);
+}
+
+/// 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()
+{
+    set_default_timeout(30);
+    set_logging(NULL,none);
+    next_id=1;
+}
+
 server::~server()
 {
     std::map<unsigned int, server_connection*>::iterator ie=connections.end();
@@ -48,9 +78,19 @@ int server::add_connection(server_connection* newconn)
     newconn->set_id(cid);
     newconn->set_server(this);
     connections[cid]=newconn;
+
+    LOGSTREAM(debug,"new connection accepted, id: " << cid);
+
     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 +119,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 +131,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 +146,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 +155,10 @@ 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;
+        return logstream;
 }
-
 };