ensure that the random number generator(s) are always seeded with a different value...

don't reinitialize random number generators in other modules
(bug #4017)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5459 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_random.c b/apps/app_random.c
index c47212a278d901b56bc23193a230fb32ff52e1cb..f8558a3b4acfb407f6a785253624b4beba30d764 100755 (executable)
--- a/apps/app_random.c
+++ b/apps/app_random.c
@@ -106,7 +106,6 @@ int unload_module(void)
 
 int load_module(void)
 {
-       srandom((unsigned int)getpid() + (unsigned int)time(NULL));
        return ast_register_application(app_random, random_exec, random_synopsis, random_descrip);
 }
 

diff --git a/asterisk.c b/asterisk.c
index ee0bef9a96387d29ee884a81e7bd9dfe6ccccb60..562cf3769d64cd4d1197c6b7dc90933147a585e9 100755 (executable)
--- a/asterisk.c
+++ b/asterisk.c
@@ -1922,6 +1922,12 @@ int main(int argc, char *argv[])
        signal(SIGCHLD, child_handler);
        signal(SIGPIPE, SIG_IGN);
 
+       /* ensure that the random number generators are seeded with a different value every time
+          Asterisk is started
+       */
+       srand((unsigned int) getpid() + (unsigned int) time(NULL));
+       srandom((unsigned int) getpid() + (unsigned int) time(NULL));
+
        if (init_logger()) {
                printf(term_quit());
                exit(1);

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 40dbdb842dec76d6af49a41db6d8063436bade22..6c0608bce7c273d445feaf82431f90fb45761858 100755 (executable)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -8465,7 +8465,6 @@ static int reload_config(void)
        ast_clear_flag((&globalflags), IAX_NOTRANSFER); 
        ast_clear_flag((&globalflags), IAX_USEJITTERBUF);       
        ast_clear_flag((&globalflags), IAX_FORCEJITTERBUF);     
-       srand(time(NULL));
        delete_users();
        set_config(config,1);
        prune_peers();

diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index cae675c17d8e9e3fdee60d3d381e92cd4fa0eccb..1c198c0e41ba048b1095edbf5e6016d94e7ca857 100755 (executable)
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -4632,9 +4632,6 @@ int load_module(void)
        dundi_set_output(dundi_debug_output);
        dundi_set_error(dundi_error_output);
        
-       /* Seed random number generator */
-       srand(time(NULL));
-       
        sin.sin_family = AF_INET;
        sin.sin_port = ntohs(DUNDI_PORT);
        sin.sin_addr.s_addr = INADDR_ANY;

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index ac6c0d54da6a151c285e3b4a0637737f363268a2..6ba33b3caaffb65c6025656f2f3fc920a3a92b55 100755 (executable)
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -169,10 +169,9 @@ static int ast_moh_files_next(struct ast_channel *chan)
                                state->pos++;
                        }
 
-                       if (ast_test_flag(state->class, MOH_RANDOMIZE)) {
-                               srand(time(NULL)+getpid()+strlen(chan->name)-state->class->total_files);
+                       if (ast_test_flag(state->class, MOH_RANDOMIZE))
                                state->pos = rand();
-                       }
+
                        /* check to see if this file's format can be opened */
                        if (ast_fileexists(state->class->filearray[state->pos], NULL, NULL) != -1)
                                break;