kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use lighter math and avoid infinite loop in port allocator (FSCORE-148) 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8909 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2008-07-07 18:13:17 +00:00
parent 3c4aa20c53
commit c785aa2305
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/switch_core_port_allocator.c
View File

@ -121,23 +121,20 @@ SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_request_port(switch_c
srand(getpid() + (unsigned) switch_timestamp(NULL));
while (alloc->track_used < alloc->track_len) {
double r;
uint32_t index;
int tries = 0;
uint32_t tries = 0;
do {
r = ((double) rand() / ((double) (RAND_MAX) + (double) (1)));
index = (int) (r * alloc->track_len);
/* randomly pick a port */
index = rand() % alloc->track_len;
/* if it is used walk up the list to find a free one */
while (alloc->track[index] && tries < alloc->track_len)
{
tries++;
} while ((alloc->track[index] || index >= alloc->track_len) && tries < 10000);
while (alloc->track[index]) {
if (++index >= alloc->track_len) {
index = 0;
}
if(++index >= alloc->track_len) index = 0;
}
if (index < alloc->track_len) {
if (tries < alloc->track_len) {
alloc->track[index] = 1;
alloc->track_used++;
status = SWITCH_STATUS_SUCCESS;