diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-09 17:07:36 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-09 17:07:36 +0000 |
| commit | 5448fa9f9e72c6bf08162480e39edb11e2754a9e (patch) | |
| tree | 39e19a7ab54bc20ed756d9df396b5c0916c5c1ff /channels/chan_iax2.c | |
| parent | 91b102ecadbbae7ee2635727fb8eb61ce274a5dc (diff) | |
Fix a problem that I had introduced into MWI handling. I had ignored
the mailbox context. Now, all related MWI event dealings pay attention
to the context as well.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@78747 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 5137d2af1..30c79e47c 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -6054,9 +6054,16 @@ static int update_registry(const char *name, struct sockaddr_in *sin, int callno if (!ast_strlen_zero(p->mailbox)) { struct ast_event *event; int new, old; + char *mailbox, *context; + + context = mailbox = ast_strdupa(p->mailbox); + strsep(&context, "@"); + if (ast_strlen_zero(context)) + context = "default"; event = ast_event_get_cached(AST_EVENT_MWI, - AST_EVENT_IE_MAILBOX, AST_EVENT_IE_PLTYPE_STR, p->mailbox, + AST_EVENT_IE_MAILBOX, AST_EVENT_IE_PLTYPE_STR, mailbox, + AST_EVENT_IE_CONTEXT, AST_EVENT_IE_PLTYPE_STR, context, AST_EVENT_IE_NEWMSGS, AST_EVENT_IE_PLTYPE_EXISTS, AST_EVENT_IE_OLDMSGS, AST_EVENT_IE_PLTYPE_EXISTS, AST_EVENT_IE_END); @@ -9315,8 +9322,14 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, st ast_free_ha(oldha); if (!ast_strlen_zero(peer->mailbox)) { + char *mailbox, *context; + mailbox = ast_strdupa(peer->mailbox); + strsep(&context, "@"); + if (ast_strlen_zero(context)) + context = "default"; peer->mwi_event_sub = ast_event_subscribe(AST_EVENT_MWI, mwi_event_cb, NULL, - AST_EVENT_IE_MAILBOX, AST_EVENT_IE_PLTYPE_STR, peer->mailbox, + AST_EVENT_IE_MAILBOX, AST_EVENT_IE_PLTYPE_STR, mailbox, + AST_EVENT_IE_CONTEXT, AST_EVENT_IE_PLTYPE_STR, context, AST_EVENT_IE_END); } |