From: Tilghman Lesher Date: Wed, 8 Dec 2010 18:04:38 +0000 (+0000) Subject: Use inheritance to get correct results for SIPFROMDOMAIN. X-Git-Tag: 1.6.2.16-rc1~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0556d73172ae0e05acbeaf2bef514fad23e39f43;p=thirdparty%2Fasterisk.git Use inheritance to get correct results for SIPFROMDOMAIN. (from an internal Digium discussion) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@297908 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample index 1162cbfc4a..607c26e525 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)