The branch, master has been updated
via 0a531de652b3c0d1f3d7810f4f772d37b64c8a10 (commit)
from 08059d7fb37e975616bac50945ba7b0d145c242e (commit)
- Log -----------------------------------------------------------------
commit 0a531de652b3c0d1f3d7810f4f772d37b64c8a10
Author: Gabriel Braga <gabriel.braga@xxxxxxxxxxxxx>
Date: Thu Apr 4 11:01:32 2024 +0200
Switch time() calls to monotonic clock calls (#7597)
In the event of a time warp the use of time() causes connections to
collapse.
This removes this problem by using a monotonic clock, based on libi2ncommon.
-----------------------------------------------------------------------
Summary of changes:
src/CMakeLists.txt | 2 +
src/monotonic_clock.cpp | 56 +++++++++++++++++++++++++++++++++++++++++++++++
src/monotonic_clock.hxx | 28 +++++++++++++++++++++++
src/server.cpp | 5 ++-
src/server.hxx | 1 +
src/socket_client.cpp | 1 +
6 files changed, 91 insertions(+), 2 deletions(-)
create mode 100644 src/monotonic_clock.cpp
create mode 100644 src/monotonic_clock.hxx
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8eac9eb..6a41eab 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,6 +13,7 @@ set(libt2n_SOURCES
socket_server.cpp
socket_wrapper.cpp
t2n_exception.cpp
+ monotonic_clock.cpp
)
set(libt2n_HEADERS
client.hxx
@@ -32,6 +33,7 @@ set(libt2n_HEADERS
types.hxx
container.tcc
t2n_exception.tcc
+ monotonic_clock.hxx
)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/src/monotonic_clock.cpp b/src/monotonic_clock.cpp
new file mode 100644
index 0000000..3b4e720
--- /dev/null
+++ b/src/monotonic_clock.cpp
@@ -0,0 +1,56 @@
+/*
+Copyright (C) 2024 by Intra2net AG
+
+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 <time.h>
+
+#include "monotonic_clock.hxx"
+
+/**
+ * @brief fetches the value from the monotonic clock source.
+ * @param[out] seconds the seconds.
+ * @param[out] nano_seconds the nano seconds.
+ * @return @a true if the clock was successfully read.
+ */
+bool monotonic_clock_gettime(long int& seconds, long int& nano_seconds)
+{
+ struct timespec tp[1];
+ int res= clock_gettime (CLOCK_MONOTONIC, tp);
+ if (0 == res)
+ {
+ seconds= tp->tv_sec;
+ nano_seconds= tp->tv_nsec;
+ }
+ return (res==0);
+}
+
+/**
+ * @brief fetches the value from the monotonic clock source.
+ * @return the time since system start in seconds, 0 if read was unsuccessful
+ */
+int monotonic_clock_gettime_sec()
+{
+ long int seconds=0;
+ long int nano_seconds;
+
+ monotonic_clock_gettime(seconds,nano_seconds);
+ return seconds;
+}
diff --git a/src/monotonic_clock.hxx b/src/monotonic_clock.hxx
new file mode 100644
index 0000000..98a9583
--- /dev/null
+++ b/src/monotonic_clock.hxx
@@ -0,0 +1,28 @@
+/*
+Copyright (C) 2024 by Intra2net AG
+
+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.
+*/
+#ifndef __LIBT2N_MONOTONIC_CLOCK
+#define __LIBT2N_MONOTONIC_CLOCK
+
+bool monotonic_clock_gettime(long int& seconds, long int& nano_seconds);
+int monotonic_clock_gettime_sec();
+
+#endif
\ No newline at end of file
diff --git a/src/server.cpp b/src/server.cpp
index 600cbef..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
diff --git a/src/server.hxx b/src/server.hxx
index cc3c5dd..ad82287 100644
--- a/src/server.hxx
+++ b/src/server.hxx
@@ -33,6 +33,7 @@ on this file might be covered by the GNU General Public
License.
#include "connection.hxx"
#include "types.hxx"
+
namespace libt2n
{
diff --git a/src/socket_client.cpp b/src/socket_client.cpp
index fecad13..954bb30 100644
--- a/src/socket_client.cpp
+++ b/src/socket_client.cpp
@@ -33,6 +33,7 @@ on this file might be covered by the GNU General Public
License.
#include <netdb.h>
#include <fcntl.h>
#include <time.h>
+
#include <pwd.h>
#include <grp.h>
hooks/post-receive
--
C++ inter-process communication library
--
libt2n-git - see http://www.intra2net.com/en/developer/libt2n for details.
To unsubscribe send a mail to libt2n-git+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx
|
