kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 43916 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r43916 | kpfleming | 2006-09-28 12:31:57 -0500 (Thu, 28 Sep 2006) | 2 lines

fix buggy (and overly complex) loop used during reload of app_queue for static member list updating

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@43919 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-09-28 17:35:42 +00:00
parent 13b9f34966
commit 78e8232ef8
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
apps/app_queue.c
View File

@@ -3708,7 +3708,7 @@ static int reload_queues(void)
struct ast_config *cfg; struct ast_config *cfg;
char *cat, *tmp; char *cat, *tmp;
struct ast_variable *var; struct ast_variable *var;
struct member *prev, *cur, *newm; struct member *prev, *cur, *newm, *next;
int new; int new;
const char *general_val = NULL; const char *general_val = NULL;
char parse[80]; char parse[80];
@@ -3825,22 +3825,19 @@ static int reload_queues(void)
} }
/* Free remaining members marked as delme */ /* Free remaining members marked as delme */
for (prev = NULL, newm = NULL, cur = q->members; cur; prev = cur, cur = cur->next) { for (prev = NULL, cur = q->members, next = cur ? cur->next : NULL;
if (newm) { cur;
free(newm); cur = next, next = cur ? cur->next : NULL) {
newm = NULL; if (!cur->delme)
} continue;
if (cur->delme) { if (prev)
if (prev) { prev->next = next;
prev->next = cur->next; else
newm = cur; q->members = next;
} else {
q->members = cur->next; remove_from_interfaces(cur->interface);
newm = cur; free(cur);
}
remove_from_interfaces(cur->interface);
}
} }
if (q->strategy == QUEUE_STRATEGY_ROUNDROBIN) if (q->strategy == QUEUE_STRATEGY_ROUNDROBIN)