diff options
| author | David Vossel <dvossel@digium.com> | 2009-10-21 14:39:10 +0000 |
|---|---|---|
| committer | David Vossel <dvossel@digium.com> | 2009-10-21 14:39:10 +0000 |
| commit | 984d6500ce28dc1d0c95394c818700b56c07974a (patch) | |
| tree | 181bec8fbb0779dcbbda5203bba790476a537082 /configs | |
| parent | 28d0ec5421212e10af9baf8c70bc32d853352b25 (diff) | |
Merged revisions 225032 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r225032 | dvossel | 2009-10-21 09:37:04 -0500 (Wed, 21 Oct 2009) | 20 lines
IAX/SIP shrinkcallerid option
The shrinking of caller id removes '(', ' ', ')', non-trailing '.',
and '-' from the string. This means values such as 555.5555 and
test-test result in 555555 and testtest. There are instances,
such as Skype integration, where a specific value is passed via
caller id that must be preserved unmodified. This patch makes
the shrinking of caller id optional in chan_sip and chan_iax in
order to support such cases. By default this option is on to
preserve previous expected behavior.
(closes issue #15940)
Reported by: dimas
Patches:
v2-15940.patch uploaded by dimas (license 88)
15940_shrinkcallerid_trunk.c uploaded by dvossel (license 671)
Tested by: dvossel
Review: https://reviewboard.asterisk.org/r/408/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@225033 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/iax.conf.sample | 9 | ||||
| -rw-r--r-- | configs/sip.conf.sample | 10 |
2 files changed, 19 insertions, 0 deletions
diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample index 765b667d7..ca28c1192 100644 --- a/configs/iax.conf.sample +++ b/configs/iax.conf.sample @@ -385,6 +385,15 @@ autokill=yes ;10.1.2.0/255.255.255.0 = 32 ; +; The shrinkcallerid function removes '(', ' ', ')', non-trailing '.', and '-' not +; in square brackets. For example, the caller id value 555.5555 becomes 5555555 +; when this option is enabled. Disabling this option results in no modification +; of the caller id value, which is necessary when the caller id represents something +; that must be preserved. This option can only be used in the [general] section. +; By default this option is on. +; +;shrinkcallerid=yes ; on by default + ; Guest sections for unauthenticated connection attempts. Just specify an ; empty secret, or provide no secret section. ; diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index 74a739161..4102f5cc5 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -340,6 +340,16 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; If you have qualify on and the peer becomes unreachable ; this setting will enforce inactivation of the regexten ; extension for the peer + +; The shrinkcallerid function removes '(', ' ', ')', non-trailing '.', and '-' not +; in square brackets. For example, the caller id value 555.5555 becomes 5555555 +; when this option is enabled. Disabling this option results in no modification +; of the caller id value, which is necessary when the caller id represents something +; that must be preserved. This option can only be used in the [general] section. +; By default this option is on. +; +;shrinkcallerid=yes ; on by default + ;------------------------ TLS settings ------------------------------------------------------------ ;tlscertfile=</path/to/certificate.pem> ; Certificate file (*.pem format only) to use for TLS connections ; default is to look for "asterisk.pem" in current directory |