[Minor] Do not use glib PRNG

diff --git a/src/libserver/worker_util.c b/src/libserver/worker_util.c
index 3d6e32d759650de98cbc27e50a0a1f4dab24faa7..91416c5ab72e00479825116dd37c1879b92c105d 100644 (file)
--- a/src/libserver/worker_util.c
+++ b/src/libserver/worker_util.c
@@ -550,11 +550,10 @@ rspamd_fork_worker (struct rspamd_main *rspamd_main,
                rc = ottery_init (rspamd_main->cfg->libs_ctx->ottery_cfg);
                if (rc != OTTERY_ERR_NONE) {
                        msg_err_main ("cannot initialize PRNG: %d", rc);
-                       g_assert (0);
+                       abort ();
                }
 
                rspamd_random_seed_fast ();
-               g_random_set_seed (ottery_rand_uint32 ());
 #ifdef HAVE_EVUTIL_RNG_INIT
                evutil_secure_rng_init ();
 #endif

diff --git a/src/libutil/addr.c b/src/libutil/addr.c
index dbb279579a5438e6afefc82ecbb527c10d4f6913..728189068824b48da8643619b91e0bbbcb048295 100644 (file)
--- a/src/libutil/addr.c
+++ b/src/libutil/addr.c
@@ -159,7 +159,7 @@ rspamd_ip_check_ipv6 (void)
                         */
                        memset (&sin6, 0, sizeof (sin6));
                        sin6.sin6_family = AF_INET6;
-                       sin6.sin6_port = g_random_int_range (20000, 60000);
+                       sin6.sin6_port = rspamd_random_uint64_fast () % 40000 + 20000;
                        sin6.sin6_addr = ip6_local;
 
                        r = bind (s, (struct sockaddr *)&sin6, sizeof (sin6));

diff --git a/src/libutil/util.c b/src/libutil/util.c
index c33a92180f8220ec80b4aadeb40266d3a01fdb78..832b7dfb7fc7c5b73b75ef9941e17535774bde18 100644 (file)
--- a/src/libutil/util.c
+++ b/src/libutil/util.c
@@ -2096,7 +2096,6 @@ rspamd_init_libs (void)
 
        SSL_CTX_set_options (ctx->ssl_ctx, ssl_options);
 #endif
-       g_random_set_seed (ottery_rand_uint32 ());
        rspamd_random_seed_fast ();
 
        /* Set stack size for pcre */