diff options
author | Brad Watkins <Marquis42@gmail.com> | 2010-12-17 17:29:09 +0000 |
---|---|---|
committer | Brad Watkins <Marquis42@gmail.com> | 2010-12-17 17:29:09 +0000 |
commit | 806d69dc935622846a523a09ba89c7c2c6a92507 (patch) | |
tree | 6ff6962f7635bb0a1f85532f3ca0ba5ea013b3f6 /configs | |
parent | 6765970cd2233484af6969549f30bd962abccd95 (diff) |
Merged revisions 298773 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r298773 | marquis | 2010-12-17 12:26:31 -0500 (Fri, 17 Dec 2010) | 10 lines
Fix parsing of mwi => lines in sip.conf
Reworking parsing of mwi => lines to resolve a segfault. Also add a set of unit tests for the function that does the parsing.
(closes issue #18350)
Reported by: gbour
Tested by: Marquis, gbour
Review: https://reviewboard.asterisk.org/r/1053/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@298774 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configs')
-rw-r--r-- | configs/sip.conf.sample | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index 320895669..03008b146 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -680,12 +680,15 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ;----------------------------------------- OUTBOUND MWI SUBSCRIPTIONS ------------------------- ; Asterisk can subscribe to receive the MWI from another SIP server and store it locally for retrieval -; by other phones. +; by other phones. At this time, you can only subscribe using UDP as the transport. ; Format for the mwi register statement is: -; mwi => user[:secret[:authuser]]@host[:port][/mailbox] +; mwi => user[:secret[:authuser]]@host[:port]/mailbox ; ; Examples: ;mwi => 1234:password@mysipprovider.com/1234 +;mwi => 1234:password@myportprovider.com:6969/1234 +;mwi => 1234:password:authuser@myauthprovider.com/1234 +;mwi => 1234:password:authuser@myauthportprovider.com:6969/1234 ; ; MWI received will be stored in the 1234 mailbox of the SIP_Remote context. It can be used by other phones by following the below: ; mailbox=1234@SIP_Remote |