X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fserver.cpp;h=600cbef1401d629b48a831730a37f9809a0e02a6;hp=79b95b42c9b324052ff720f70d7c02b7b77368ac;hb=HEAD;hpb=c209619c4d44a3e9c5b0f537f53ec65564899efb

diff --git a/src/server.cpp b/src/server.cpp
index 79b95b4..7ee28f2 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -28,6 +28,7 @@ on this file might be covered by the GNU General Public License.
 
 #include "server.hxx"
 #include "log.hxx"
+#include "monotonic_clock.hxx"
 
 namespace libt2n
 {
@@ -65,7 +66,7 @@ std::ostream* server_connection::get_logstream(log_level_values 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 < monotonic_clock_gettime_sec())
     {
         LOGSTREAM(debug,"timeout on connection " << connection_id << ", closing");
         this->close();
@@ -75,7 +76,7 @@ void server_connection::check_timeout()
 /// reset the timeout, e.g. if something is received
 void server_connection::reset_timeout()
 {
-    last_action_time=time(NULL);
+    last_action_time=monotonic_clock_gettime_sec();
 }
 
 /** @brief add a callback to one connection
@@ -140,9 +141,9 @@ void server::add_callback(callback_event_type event, const boost::function<void
 }
 
 
-/** @brief an event occured, call all server-side callbacks
+/** @brief an event occurred, call all server-side callbacks
 
-    @param event event that occured
+    @param event event that occurred
     @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)