diff options
| author | Russell Bryant <russell@russellbryant.com> | 2012-12-13 16:18:52 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2012-12-13 16:18:52 +0000 |
| commit | fad26372972027531474d122f68b02ea66255287 (patch) | |
| tree | eeebcfa16e675d7b21c2db20f0c20b4bffc56d5d /main | |
| parent | 71b1e411b026aa14f0ad3cfeb4e8d7fcdc6a6ea7 (diff) | |
Remove compile time check HAVE_DEV_URANDOM.
The code was doing a runtime check, anyway. The compile time check isn't
always valid (cross-compiling, packages).
Review: https://reviewboard.asterisk.org/r/2245/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377977 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/utils.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/main/utils.c b/main/utils.c index 24a8326a8..cdb9b1a44 100644 --- a/main/utils.c +++ b/main/utils.c @@ -35,9 +35,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/stat.h> #include <sys/stat.h> -#ifdef HAVE_DEV_URANDOM #include <fcntl.h> -#endif #include <sys/syscall.h> #if defined(__APPLE__) @@ -496,9 +494,7 @@ const char *ast_inet_ntoa(struct in_addr ia) return inet_ntop(AF_INET, &ia, buf, INET_ADDRSTRLEN); } -#ifdef HAVE_DEV_URANDOM static int dev_urandom_fd; -#endif #ifndef __linux__ #undef pthread_create /* For ast_pthread_create function only */ @@ -1494,7 +1490,7 @@ AST_MUTEX_DEFINE_STATIC(randomlock); long int ast_random(void) { long int res; -#ifdef HAVE_DEV_URANDOM + if (dev_urandom_fd >= 0) { int read_res = read(dev_urandom_fd, &res, sizeof(res)); if (read_res > 0) { @@ -1504,7 +1500,7 @@ long int ast_random(void) return res % rm; } } -#endif + /* XXX - Thread safety really depends on the libc, not the OS. * * But... popular Linux libc's (uClibc, glibc, eglibc), all have a @@ -2035,9 +2031,7 @@ int ast_mkdir(const char *path, int mode) int ast_utils_init(void) { -#ifdef HAVE_DEV_URANDOM dev_urandom_fd = open("/dev/urandom", O_RDONLY); -#endif base64_init(); #ifdef DEBUG_THREADS #if !defined(LOW_MEMORY) |