diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-27 18:09:49 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-27 18:09:49 +0000 |
commit | 4793ed0202690b9cb09e07b6149b2c2b64eee94e (patch) | |
tree | cfae153ecdd46e9a8084d49aadea18716e8f7774 | |
parent | a2feca1af2820b283b4d4a18f3727c2ea2a9fb9e (diff) |
Merged revisions 184726 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r184726 | russell | 2009-03-27 13:04:43 -0500 (Fri, 27 Mar 2009) | 2 lines
Use ast_random() instead of rand() to ensure we use the best RNG available.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@184728 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_minivm.c | 4 | ||||
-rw-r--r-- | main/manager.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_minivm.c b/apps/app_minivm.c index 632edd08f..731f06028 100644 --- a/apps/app_minivm.c +++ b/apps/app_minivm.c @@ -1031,7 +1031,7 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu } ast_debug(4, "Fromstring now: %s\n", ast_strlen_zero(passdata) ? "-default-" : passdata); - fprintf(p, "Message-ID: <Asterisk-%d-%s-%d-%s>\n", (unsigned int)rand(), vmu->username, (int)getpid(), who); + fprintf(p, "Message-ID: <Asterisk-%d-%s-%d-%s>\n", (unsigned int)ast_random(), vmu->username, (int)getpid(), who); len_passdata = strlen(vmu->fullname) * 2 + 3; passdata2 = alloca(len_passdata); if (!ast_strlen_zero(vmu->email)) @@ -1064,7 +1064,7 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu fprintf(p, "MIME-Version: 1.0\n"); /* Something unique. */ - snprintf(bound, sizeof(bound), "voicemail_%s%d%d", vmu->username, (int)getpid(), (unsigned int)rand()); + snprintf(bound, sizeof(bound), "voicemail_%s%d%d", vmu->username, (int)getpid(), (unsigned int)ast_random()); fprintf(p, "Content-Type: multipart/mixed; boundary=\"%s\"\n\n\n", bound); diff --git a/main/manager.c b/main/manager.c index 9e83328cd..4ee08a4a6 100644 --- a/main/manager.c +++ b/main/manager.c @@ -3791,7 +3791,7 @@ static struct ast_str *generic_http_callback(enum output_format format, * properties of the rand() function (and the constantcy of s), that * won't happen twice in a row. */ - while ((session->managerid = rand() ^ (unsigned long) session) == 0); + while ((session->managerid = ast_random() ^ (unsigned long) session) == 0); session->last_ev = grab_last(); AST_LIST_HEAD_INIT_NOLOCK(&session->datastores); AST_LIST_LOCK(&sessions); |