kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-06 18:30:01 +00:00
Code Issues Projects Releases Wiki Activity

make port allocator more random

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12673 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-03-20 01:48:30 +00:00
parent ffb1cb4f69
commit e1af589def
1 changed files with 8 additions and 5 deletions

11
src/switch_core_port_allocator.c

@ -39,7 +39,7 @@ struct switch_core_port_allocator {
switch_port_t start; switch_port_t start;
switch_port_t end; switch_port_t end;
switch_port_t next; switch_port_t next;
switch_byte_t *track; int8_t *track;
uint32_t track_len; uint32_t track_len;
uint32_t track_used; uint32_t track_used;
switch_port_flag_t flags; switch_port_flag_t flags;
@ -118,7 +118,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_request_port(switch_c
int odd = switch_test_flag(alloc, SPF_ODD); int odd = switch_test_flag(alloc, SPF_ODD);
switch_mutex_lock(alloc->mutex); switch_mutex_lock(alloc->mutex);
srand(getpid() + (unsigned) switch_epoch_time_now(NULL)); srand((unsigned)(intptr_t)port_ptr + switch_thread_self() + switch_micro_time_now());
while (alloc->track_used < alloc->track_len) { while (alloc->track_used < alloc->track_len) {
uint32_t index; uint32_t index;
@ -131,6 +131,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_request_port(switch_c
while (alloc->track[index] && tries < alloc->track_len) while (alloc->track[index] && tries < alloc->track_len)
{ {
tries++; tries++;
if (alloc->track[index] < 0) {
alloc->track[index]++;
}
if (++index >= alloc->track_len) { if (++index >= alloc->track_len) {
index = 0; index = 0;
} }
@ -179,8 +182,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_free_port(switch_core
} }
switch_mutex_lock(alloc->mutex); switch_mutex_lock(alloc->mutex);
if (alloc->track[index]) { if (alloc->track[index] > 0) {
alloc->track[index] = 0; alloc->track[index] = -4;
alloc->track_used--; alloc->track_used--;
status = SWITCH_STATUS_SUCCESS; status = SWITCH_STATUS_SUCCESS;
} }