From f9ceee6691a66cbde0e54d3b510636fc5c1a9e49 Mon Sep 17 00:00:00 2001 From: mnicholson Date: Fri, 4 Mar 2011 17:44:44 +0000 Subject: Add support for defining hints from pbx_lua (closes issue #16024) Reported by: mnicholson git-svn-id: http://svn.digium.com/svn/asterisk/trunk@309493 f38db490-d61c-443f-a65b-d21fe96a405b --- configs/extensions.lua.sample | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'configs') diff --git a/configs/extensions.lua.sample b/configs/extensions.lua.sample index df32ec705..bd6fb1f95 100644 --- a/configs/extensions.lua.sample +++ b/configs/extensions.lua.sample @@ -197,3 +197,14 @@ extensions = { }; } +hints = { + demo = { + [1000] = "SIP/1000"; + [1001] = "SIP/1001"; + }; + + default = { + ["1234"] = "SIP/1234"; + }; +} + -- cgit v1.2.3 From 77bc3aa8e34931ad899c144dd8f570c65da60151 Mon Sep 17 00:00:00 2001 From: twilson Date: Fri, 4 Mar 2011 23:22:39 +0000 Subject: Add setvar option to calendaring Adding the setvar option with variable substitution on the value allows things like setting the outbound caller id name to the summary of a calendar event, etc. Values could be chained together as they are appended in order to do some scripting if necessary. Review: https://reviewboard.asterisk.org/r/1134/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@309640 f38db490-d61c-443f-a65b-d21fe96a405b --- configs/calendar.conf.sample | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'configs') diff --git a/configs/calendar.conf.sample b/configs/calendar.conf.sample index ad3ce0983..82b8702f0 100644 --- a/configs/calendar.conf.sample +++ b/configs/calendar.conf.sample @@ -32,6 +32,13 @@ ;appdata = tt-weasels ; Data part of application to execute on answer ; ;waittime = 30 ; How long to wait for an answer, defaults to 30 seconds +; +; Channel variables can be set on the notification channel. The format is +; setvar=name=value. Variable subsitution is done on the value to allow the use of dialplan +; functions like CALENDAR_EVENT. The variables are set in order, so one can use the value +; of earlier variables in the definition of later ones. +; +;setvar = CALLERID(name)=${CALENDAR_EVENT(summary)} ;[calendar2] ; Note: Support for Exchange Server 2003 -- cgit v1.2.3 From e8ef120f63f363c7113e750b22708dff0cb10258 Mon Sep 17 00:00:00 2001 From: mmichelson Date: Mon, 7 Mar 2011 00:14:34 +0000 Subject: Merged revisions 309765 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r309765 | mmichelson | 2011-03-06 18:13:36 -0600 (Sun, 06 Mar 2011) | 3 lines Indicate that Asterisk uses the Allow header to determine if MESSAGE requests should be sent. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@309766 f38db490-d61c-443f-a65b-d21fe96a405b --- configs/sip.conf.sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configs') diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index 92e41e440..a60ea347d 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -179,8 +179,8 @@ udpbindaddr=0.0.0.0 ; IP address to bind UDP listen socket to (0.0.0 ; ; Note also that while Asterisk currently will parse an Allow header to learn ; what methods an endpoint supports, the only actual use for this currently -; is for determining if Asterisk may send connected line UPDATE requests. Its -; use may be expanded in the future. +; is for determining if Asterisk may send connected line UPDATE requests and +; MESSAGE requests. Its use may be expanded in the future. ; ; disallowed_methods = UPDATE -- cgit v1.2.3 From 637615be4b67c553945f6ca18f476cf7f6cc1a16 Mon Sep 17 00:00:00 2001 From: alecdavis Date: Thu, 17 Mar 2011 10:51:57 +0000 Subject: Merged revisions 311050 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r311050 | alecdavis | 2011-03-17 23:49:41 +1300 (Thu, 17 Mar 2011) | 24 lines Merged revisions 311049 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r311049 | alecdavis | 2011-03-17 23:45:47 +1300 (Thu, 17 Mar 2011) | 17 lines Merged revisions 311048 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r311048 | alecdavis | 2011-03-17 23:43:35 +1300 (Thu, 17 Mar 2011) | 12 lines Remove extra quote in indications.conf Picking low hanging fruit. (closes issue #18971) Reported by: IgorG Patches: based on indications.conf.sample.diff uploaded by IgorG (license 20) Tested by: IgorG ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@311051 f38db490-d61c-443f-a65b-d21fe96a405b --- configs/indications.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs') diff --git a/configs/indications.conf.sample b/configs/indications.conf.sample index 60efcb3ef..1a0cfc1da 100644 --- a/configs/indications.conf.sample +++ b/configs/indications.conf.sample @@ -153,7 +153,7 @@ ring = 425/1000,0/3000 congestion = 425/167,0/167 callwaiting = 1400/175,0/175,1400/175,0/3500 ; DIALRECALL - not specified -dialrecall = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" +dialrecall = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440 ; RECORDTONE - not specified record = 1400/500,0/15000 info = 900/330,1400/330,1800/330,0/1000 -- cgit v1.2.3