'reseed_srand' event - libratbox and various ssl stuff need it

[solanum.git] / src / ircd.c

diff --git a/src/ircd.c b/src/ircd.c
index 017fc0fa44c659fc6205d9cfc4626a707be586d3..b46ee034595f851b5c9e450191d71d53d97604b8 100644 (file)
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -502,6 +502,47 @@ setup_corefile(void)
 
 struct ev_entry *check_splitmode_ev = NULL;
 
+static int
+seed_with_urandom(void)
+{
+       unsigned int seed;
+       int fd;
+
+       fd = open("/dev/urandom", O_RDONLY);
+       if(fd >= 0)
+       {
+               if(read(fd, &seed, sizeof(seed)) == sizeof(seed))
+               {
+                       close(fd);
+                       srand(seed);
+                       return 1;
+               }
+       }
+       return 0;
+}
+
+static void
+seed_with_clock(void)
+{
+       const struct timeval *tv;       
+       rb_set_time();
+       tv = rb_current_time_tv();
+       srand(tv->tv_sec ^ (tv->tv_usec | (getpid() << 20)));
+}
+
+static void
+seed_random(void *unused)
+{
+       unsigned int seed;
+       if(rb_get_random(&seed, sizeof(seed)) == -1)
+       {
+               if(!seed_with_urandom())
+                       seed_with_clock();
+               return;
+       }
+       srand(seed);
+}
+
 /*
  * main
  *
@@ -719,8 +760,8 @@ main(int argc, char *argv[])
         */
        rb_event_addish("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
        rb_event_addonce("try_connections_startup", try_connections, NULL, 0);
-
        rb_event_add("check_rehash", check_rehash, NULL, 1);
+       rb_event_addish("reseed_srand", seed_random, NULL, 300); /* reseed every 10 minutes */
 
        if(splitmode)
                check_splitmode_ev = rb_event_add("check_splitmode", check_splitmode, NULL, 2);