kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-21 20:40:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 50895 via svnmerge from

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

........
r50895 | file | 2007-01-15 11:36:07 -0500 (Mon, 15 Jan 2007) | 2 lines

Move event processing into do_message so that it gets executed again when events are tripped.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@50896 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-01-15 16:40:48 +00:00
parent 74f401d05f
commit 2964e9eab6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/manager.c
View File

@@ -2135,6 +2135,9 @@ static int do_message(struct mansession *s)
int res;
for (;;) {
/* Check if any events are pending and do them if needed */
if (process_events(s))
return -1;
res = get_input(s, header_buf);
if (res == 0) {
continue;
@@ -2195,8 +2198,7 @@ static void *session_do(void *data)
astman_append(s, "Asterisk Call Manager/1.0\r\n"); /* welcome prompt */
ast_mutex_unlock(&s->__lock);
for (;;) {
res = do_message(s);
if ((res < 0) || (process_events(s)))
if ((res = do_message(s)) < 0)
break;
}
/* session is over, explain why and terminate */