From f315a4b0a48a1fd405a71e552ef228404a82fafb Mon Sep 17 00:00:00 2001
From: Kenneth Giusti <kgiusti@redhat.com>
Date: Mon, 13 Nov 2023 17:10:23 -0500
Subject: [PATCH] TEST-RANDOM-SEED: do not merge

---
 src/CMakeLists.txt |  1 +
 src/config.h.in    |  1 +
 src/dispatch.c     | 22 ++++++++++++++++++----
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fc7a3f323..11017f926 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -186,6 +186,7 @@ target_link_libraries(skupper-router PUBLIC ${qpid_dispatch_LIBRARIES})
 
 # check for various function availability
 check_symbol_exists(getrlimit sys/resource.h QD_HAVE_GETRLIMIT)
+check_symbol_exists(getrandom sys/random.h QD_HAVE_GETRANDOM)
 
 # https://stackoverflow.com/questions/54771452/expanding-a-variable-cmakedefine-and-generator-expression-in-template-file
 file(READ "${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" CONFIG_H_IN)
diff --git a/src/config.h.in b/src/config.h.in
index 258038fe3..8d1974a4a 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -22,4 +22,5 @@
 #define QPID_DISPATCH_VERSION "${QPID_DISPATCH_VERSION}"
 #define QPID_DISPATCH_HTTP_ROOT_DIR "${QPID_DISPATCH_HTML_DIR}"
 #cmakedefine01 QD_HAVE_GETRLIMIT
+#cmakedefine01 QD_HAVE_GETRANDOM
 #endif // __src_config_h_in__
diff --git a/src/dispatch.c b/src/dispatch.c
index a097d19f1..fc27056b9 100644
--- a/src/dispatch.c
+++ b/src/dispatch.c
@@ -41,6 +41,7 @@
 #include <dlfcn.h>
 #include <inttypes.h>
 #include <stdlib.h>
+#include <sys/random.h>
 
 /**
  * Private Function Prototypes
@@ -89,11 +90,24 @@ qd_dispatch_t *qd_dispatch(const char *python_pkgdir, bool test_hooks)
     _test_hooks = test_hooks;
 
     //
-    // Seed the random number generator
+    // Seed the random number generator. The router does not need crypto-grade randomness so a Pseudo-RNG is acceptable.
     //
-    struct timeval time;
-    gettimeofday(&time, NULL);
-    srandom((unsigned int)time.tv_sec + ((unsigned int)time.tv_usec << 11));
+    unsigned int seed = 0;
+#if QD_HAVE_GETRANDOM
+    while (getrandom(&seed, sizeof(seed), 0) == -1 && errno == EINTR) {
+        // EINTR will occur only if a signal arrives while blocking for
+        // the entropy pool to initialize. Non-fatal, try again.
+    }
+#endif
+    if (seed == 0) {  // getrandom() not supported
+        struct timespec tspec;
+        clock_gettime(CLOCK_MONOTONIC, &tspec);
+        // rotate lower (more random) bits to make them more significant
+        unsigned int timestamp = (unsigned int) (tspec.tv_sec + tspec.tv_nsec);
+        timestamp = (timestamp<<11) | (timestamp>>(sizeof(timestamp) * CHAR_BIT - 11));
+        seed = (unsigned int)(getpid() ^ timestamp);
+    }
+    srandom(seed);
 
     qd = NEW(qd_dispatch_t);
     ZERO(qd);