Mercurial > hg > nginx
changeset 6651:7d4e33092e2a
Always seed PRNG with PID, seconds, and milliseconds.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Thu, 04 Aug 2016 23:43:10 +0300 |
parents | 1a1d55834b5c |
children | 1891b2892b68 |
files | src/os/unix/ngx_posix_init.c src/os/unix/ngx_process_cycle.c src/os/win32/ngx_process_cycle.c src/os/win32/ngx_win32_init.c |
diffstat | 4 files changed, 19 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os/unix/ngx_posix_init.c Thu Aug 04 23:42:00 2016 +0300 +++ b/src/os/unix/ngx_posix_init.c Thu Aug 04 23:43:10 2016 +0300 @@ -33,7 +33,8 @@ ngx_int_t ngx_os_init(ngx_log_t *log) { - ngx_uint_t n; + ngx_time_t *tp; + ngx_uint_t n; #if (NGX_HAVE_OS_SPECIFIC_INIT) if (ngx_os_specific_init(log) != NGX_OK) { @@ -76,7 +77,8 @@ ngx_inherited_nonblocking = 0; #endif - srandom(ngx_time()); + tp = ngx_timeofday(); + srandom(((unsigned) ngx_pid << 16) ^ tp->sec ^ tp->msec); return NGX_OK; }
--- a/src/os/unix/ngx_process_cycle.c Thu Aug 04 23:42:00 2016 +0300 +++ b/src/os/unix/ngx_process_cycle.c Thu Aug 04 23:43:10 2016 +0300 @@ -785,6 +785,7 @@ { sigset_t set; ngx_int_t n; + ngx_time_t *tp; ngx_uint_t i; ngx_cpuset_t *cpu_affinity; struct rlimit rlmt; @@ -884,7 +885,8 @@ "sigprocmask() failed"); } - srandom(((unsigned) ngx_pid << 16) ^ ngx_time()); + tp = ngx_timeofday(); + srandom(((unsigned) ngx_pid << 16) ^ tp->sec ^ tp->msec); /* * disable deleting previous events for the listening sockets because
--- a/src/os/win32/ngx_process_cycle.c Thu Aug 04 23:42:00 2016 +0300 +++ b/src/os/win32/ngx_process_cycle.c Thu Aug 04 23:43:10 2016 +0300 @@ -762,9 +762,11 @@ ngx_worker_thread(void *data) { ngx_int_t n; + ngx_time_t *tp; ngx_cycle_t *cycle; - srand((ngx_pid << 16) ^ (unsigned) ngx_time()); + tp = ngx_timeofday(); + srand((ngx_pid << 16) ^ (unsigned) tp->sec ^ tp->msec); cycle = (ngx_cycle_t *) ngx_cycle;
--- a/src/os/win32/ngx_win32_init.c Thu Aug 04 23:42:00 2016 +0300 +++ b/src/os/win32/ngx_win32_init.c Thu Aug 04 23:43:10 2016 +0300 @@ -59,12 +59,13 @@ ngx_int_t ngx_os_init(ngx_log_t *log) { - DWORD bytes; - SOCKET s; - WSADATA wsd; - ngx_err_t err; - ngx_uint_t n; - SYSTEM_INFO si; + DWORD bytes; + SOCKET s; + WSADATA wsd; + ngx_err_t err; + ngx_time_t *tp; + ngx_uint_t n; + SYSTEM_INFO si; /* get Windows version */ @@ -237,7 +238,8 @@ ngx_sprintf((u_char *) ngx_unique, "%P%Z", ngx_pid); } - srand((ngx_pid << 16) ^ (unsigned) ngx_time()); + tp = ngx_timeofday(); + srand((ngx_pid << 16) ^ (unsigned) tp->sec ^ tp->msec); return NGX_OK; }