Adding DOCUMENTATION flag to the CMakeLists.txt

[libt2n] / src / server.cpp

diff --git a/src/server.cpp b/src/server.cpp
index 749f4fb..7ee28f2 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1,21 +1,24 @@
-/***************************************************************************
- *   Copyright (C) 2006 by Gerd v. Egidy                                   *
- *   gve@intra2net.com                                                     *
- *                                                                         *
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU Lesser General Public License for more details.                   *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this program; if not, write to the                 *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
+/*
+Copyright (C) 2006 by Intra2net AG - Gerd v. Egidy
+
+The software in this package is distributed under the GNU General
+Public License version 2 (with a special exception described below).
+
+A copy of GNU General Public License (GPL) is included in this distribution,
+in the file COPYING.GPL.
+
+As a special exception, if other files instantiate templates or use macros
+or inline functions from this file, or you compile this file and link it
+with other works to produce a work based on this file, this file
+does not by itself cause the resulting work to be covered
+by the GNU General Public License.
+
+However the source code for this file must still be made available
+in accordance with section (3) of the GNU General Public License.
+
+This exception does not invalidate any other reasons why a work based
+on this file might be covered by the GNU General Public License.
+*/
 
 #include <sstream>
 #include <stdexcept>
@@ -25,6 +28,7 @@
 
 #include "server.hxx"
 #include "log.hxx"
+#include "monotonic_clock.hxx"
 
 namespace libt2n
 {
@@ -62,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();
@@ -72,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
@@ -137,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)