diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-12-19 16:52:43 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-12-19 16:52:43 +0000 |
| commit | e4803bbd9eba2705615e2495de0ed0c35051dd45 (patch) | |
| tree | fe8787ab22e2c694e93c4ec2757e3d8ca4c681dc /channels/chan_unistim.c | |
| parent | 2882c5f9f1f1c81a5a2bae35825d81070bb10164 (diff) | |
Voicemail: Remove mailbox identifier format (box@context) assumptions in the system.
This change is in preparation for external MWI support.
Removed code from the system for normal mailbox handling that appends
@default to the mailbox identifier if it does not have a context. The
only exception is the legacy hasvoicemail users.conf option. The legacy
option will only work for app_voicemail mailboxes. The system cannot make
any assumptions about the format of the mailbox identifer used by
app_voicemail.
chan_sip and chan_dahdi/sig_pri had the most changes because they both
tried to interpret the mailbox identifier. chan_sip just stored and
compared the two components. chan_dahdi actually used the box
information.
The ISDN MWI support configuration options had to be reworked because
chan_dahdi was parsing the box@context format to get the box number. As a
result the mwi_vm_boxes chan_dahdi.conf option was added and is documented
in the chan_dahdi.conf.sample file.
Review: https://reviewboard.asterisk.org/r/3072/
........
Merged revisions 404348 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404350 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_unistim.c')
| -rw-r--r-- | channels/chan_unistim.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index bc79f5ee0..2f4b9c6a7 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -5504,27 +5504,17 @@ static int unistim_sendtext(struct ast_channel *ast, const char *text) static int unistim_send_mwi_to_peer(struct unistim_line *peer, unsigned int tick) { int new; - char *mailbox, *context; RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup); - struct ast_str *uniqueid = ast_str_alloca(AST_MAX_MAILBOX_UNIQUEID); - - context = mailbox = ast_strdupa(peer->mailbox); - strsep(&context, "@"); - if (ast_strlen_zero(context)) { - context = "default"; - } - - ast_str_set(&uniqueid, 0, "%s@%s", mailbox, context); - - msg = stasis_cache_get(ast_mwi_state_cache(), ast_mwi_state_type(), ast_str_buffer(uniqueid)); + msg = stasis_cache_get(ast_mwi_state_cache(), ast_mwi_state_type(), peer->mailbox); if (msg) { struct ast_mwi_state *mwi_state = stasis_message_data(msg); new = mwi_state->new_msgs; } else { /* Fall back on checking the mailbox directly */ - new = ast_app_has_voicemail(peer->mailbox, "INBOX"); + new = ast_app_has_voicemail(peer->mailbox, NULL); } - ast_debug(3, "MWI Status for mailbox %s is %d, lastmsgsent:%d\n",mailbox,new,peer->parent->lastmsgssent); + ast_debug(3, "MWI Status for mailbox %s is %d, lastmsgsent:%d\n", + peer->mailbox, new, peer->parent->lastmsgssent); peer->parent->nextmsgcheck = tick + TIMER_MWI; /* Return now if it's the same thing we told them last time */ |