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_dahdi.h | |
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_dahdi.h')
-rw-r--r-- | channels/chan_dahdi.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_dahdi.h b/channels/chan_dahdi.h index 91c961910..d302bd7f7 100644 --- a/channels/chan_dahdi.h +++ b/channels/chan_dahdi.h @@ -38,6 +38,7 @@ #include "asterisk/channel.h" #include "asterisk/dsp.h" +#include "asterisk/app.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { @@ -621,7 +622,7 @@ struct dahdi_pvt { * \brief Voice mailbox location. * \note Set from the "mailbox" string read in from chan_dahdi.conf */ - char mailbox[AST_MAX_EXTENSION]; + char mailbox[AST_MAX_MAILBOX_UNIQUEID]; /*! \brief Opaque event subscription parameters for message waiting indication support. */ struct stasis_subscription *mwi_event_sub; /*! \brief Delayed dialing for E911. Overlap digits for ISDN. */ |