diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-01-15 16:40:48 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-01-15 16:40:48 +0000 |
| commit | 2964e9eab68c94659cc521d9a8113b8a8382c2e5 (patch) | |
| tree | fe7b0bd6e3859fc5feea8a4ec191213dd3541297 /main | |
| parent | 74f401d05f8824e82cfdc33f6d5b61bc985bad4a (diff) | |
Merged revisions 50895 via svnmerge from
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
Diffstat (limited to 'main')
| -rw-r--r-- | main/manager.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/manager.c b/main/manager.c index 88d8e26e2..a071283b5 100644 --- a/main/manager.c +++ b/main/manager.c @@ -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 */ |