From e4803bbd9eba2705615e2495de0ed0c35051dd45 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Thu, 19 Dec 2013 16:52:43 +0000 Subject: 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 --- channels/sip/include/sip.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'channels/sip/include') diff --git a/channels/sip/include/sip.h b/channels/sip/include/sip.h index 524d4e32d..0b88dae43 100644 --- a/channels/sip/include/sip.h +++ b/channels/sip/include/sip.h @@ -1232,7 +1232,7 @@ struct sip_pkt { /*! * \brief A peer's mailbox * - * We could use STRINGFIELDS here, but for only two strings, it seems like + * We could use STRINGFIELDS here, but for only one string, its * too much effort ... */ struct sip_mailbox { @@ -1240,8 +1240,7 @@ struct sip_mailbox { struct stasis_subscription *event_sub; AST_LIST_ENTRY(sip_mailbox) entry; unsigned int delme:1; - char *context; - char mailbox[2]; + char id[1]; }; /*! \brief Structure for SIP peer data, we place calls to peers if registered or fixed IP address (host) -- cgit v1.2.3