diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-23 00:42:09 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-23 00:42:09 +0000 |
| commit | f6b9b9c331d3b1858724188500a7cadf146bfee7 (patch) | |
| tree | 899f3bf5e19f082893f9d991c9b6bfcee9e28fe6 /configs | |
| parent | a4c14ea2dbf8bcb7455a28de27ab4eb8deebd1d7 (diff) | |
Backporting register line parsing from trunk to fix a bad parsing error in 1.6.0.
(closes issue #16491)
Reported by: jamicque
Patches:
20100114__issue16491.diff.txt uploaded by tilghman (license 14)
Tested by: jamicque
........
r213098 | tilghman | 2009-08-19 16:05:17 -0500 (Wed, 19 Aug 2009) | 9 lines
Better parsing for the "register" line
Allows characters that are otherwise used as delimiters to be used within
certain fields (like the secret).
(closes issue #15008, closes issue #15672)
Reported by: tilghman
Patches:
20090818__issue15008.diff.txt uploaded by tilghman (license 14)
Tested by: lmadsen, tilghman
........
r213635 | dvossel | 2009-08-21 16:02:50 -0500 (Fri, 21 Aug 2009) | 5 lines
fixes sip register parsing when user@domain is used
(issue #15008)
(issue #15672)
........
r215222 | tilghman | 2009-09-01 16:19:40 -0500 (Tue, 01 Sep 2009) | 3 lines
Fix register such that lines with a transport string, but without an authuser, parse correctly.
(AST-228)
........
r215801 | tilghman | 2009-09-02 22:43:51 -0500 (Wed, 02 Sep 2009) | 5 lines
Default the callback extension to "s". This is a regression.
(closes issue #15764)
Reported by: elguero
Change-type: bugfix
........
r235132 | dvossel | 2009-12-15 12:43:06 -0600 (Tue, 15 Dec 2009) | 14 lines
reverse minor sip registration regression
A registration regression caused by a code tweak in (issue #14331)
and a bug fix in (issue #15539) caused some sip registration
config entries to be constructed incorrectly. Origially
issue #14331 contained the code tweak as well as a bug fix, but since
the issue was reported as a tweak the bug fix portion was moved into
issue #15539. Both the tweak and the bug fix contained minor incorrect
logic that resulted in some SIP registrations to fail.
(issue #14331)
(issue #15539)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@242514 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/sip.conf.sample | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index 2e48c9d0f..f68361424 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -437,7 +437,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ;----------------------------------------- OUTBOUND SIP REGISTRATIONS ------------------------ ; Asterisk can register as a SIP user agent to a SIP proxy (provider) ; Format for the register statement is: -; register => [transport://]user[@domain][:secret[:authuser]]@host[:port][/extension] +; register => [peer?][transport://]user[@domain][:secret[:authuser]]@host[:port][/extension][~expiry] ; ; ; |