From 4884019de5a71670116137354145f0c7661df513 Mon Sep 17 00:00:00 2001 From: dvossel Date: Wed, 21 Oct 2009 15:26:37 +0000 Subject: Merged revisions 225033 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r225033 | dvossel | 2009-10-21 09:39:10 -0500 (Wed, 21 Oct 2009) | 27 lines 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: http://svn.digium.com/svn/asterisk/branches/1.6.1@225062 f38db490-d61c-443f-a65b-d21fe96a405b --- configs/iax.conf.sample | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'configs/iax.conf.sample') diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample index 773fb4065..805e5213c 100644 --- a/configs/iax.conf.sample +++ b/configs/iax.conf.sample @@ -377,6 +377,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. ; -- cgit v1.2.3