diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-08 18:08:27 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-08 18:08:27 +0000 |
| commit | 68a43f3ce0c0fe5c307de24e4fe4d73f44b89258 (patch) | |
| tree | e6c2e68cd2e3eccef6f15af117dea3d0115cfcb9 /configs/extensions.conf.sample | |
| parent | ff8c14227ddc41f36c2aff3dd794fa4e79ac885f (diff) | |
Merged revisions 297909 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r297909 | tilghman | 2010-12-08 12:06:04 -0600 (Wed, 08 Dec 2010) | 11 lines
Merged revisions 297908 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r297908 | tilghman | 2010-12-08 12:04:38 -0600 (Wed, 08 Dec 2010) | 4 lines
Use inheritance to get correct results for SIPFROMDOMAIN.
(from an internal Digium discussion)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@297910 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs/extensions.conf.sample')
| -rw-r--r-- | configs/extensions.conf.sample | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample index 1b09afc02..2489d183b 100644 --- a/configs/extensions.conf.sample +++ b/configs/extensions.conf.sample @@ -428,9 +428,9 @@ same => n,Set(isnresult=${ENUMLOOKUP(${EXTEN},sip,,1,freenum.org)}) ; perfor same => n,GotoIf($["${isnresult}" != ""]?from) same => n,Set(DIALSTATUS=CONGESTION) same => n,Goto(fn-CONGESTION,1) -same => n(from),Set(SIPFROMUSER=${CALLERID(num)}) +same => n(from),Set(__SIPFROMUSER=${CALLERID(num)}) same => n,GotoIf($["${GLOBAL(FREENUMDOMAIN)}" = ""]?dial) ; check if we set the FREENUMDOMAIN global variable in [global] -same => n,Set(SIPFROMDOMAIN=${GLOBAL(FREENUMDOMAIN)}) ; if we did set it, then we'll use it for our outbound dialing domain +same => n,Set(__SIPFROMDOMAIN=${GLOBAL(FREENUMDOMAIN)}) ; if we did set it, then we'll use it for our outbound dialing domain same => n(dial),Dial(SIP/${isnresult},40) same => n,Goto(fn-${DIALSTATUS},1) |