[asterisk-commits] tilghman: branch 1.6.2 r260281 - in /branches/1.6.2: ./ configs/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Apr 30 00:25:06 2010
New Revision: 260281

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=260281
Log:
Merged revisions 260280 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r260280 | tilghman | 2010-04-30 00:23:56 -0500 (Fri, 30 Apr 2010) | 7 lines
  
  Logic fixups for a sample FREENUM dialplan context.
  
  (closes issue #17263)
   Reported by: pprindeville
   Patches: 
         freenum-dialplan.patch#3 uploaded by pprindeville (license 347)
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/configs/extensions.conf.sample

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/configs/extensions.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/configs/extensions.conf.sample?view=diff&rev=260281&r1=260280&r2=260281
==============================================================================
--- branches/1.6.2/configs/extensions.conf.sample (original)
+++ branches/1.6.2/configs/extensions.conf.sample Fri Apr 30 00:25:06 2010
@@ -421,18 +421,22 @@
 ;
 exten => _X!,1,Verbose(2,Performing ISN lookup for ${EXTEN})
 same => n,Set(SUFFIX=${CUT(EXTEN,*,2-)})                                ; make sure the suffix is all digits as well
-same => n,GotoIf($["${FILTER(0-9,${SUFFIX})}" != "${SUFFIX}"]?i:)       ; filter out bad characters per the README-SERIOUSLY.best-practices.txt document
+same => n,GotoIf($["${FILTER(0-9,${SUFFIX})}" != "${SUFFIX}"]?fn-CONGESTION,1)
+                                                                        ; filter out bad characters per the README-SERIOUSLY.best-practices.txt document
 same => n,Set(TIMEOUT(absolute)=10800)
 same => n,Set(isnresult=${ENUMLOOKUP(${EXTEN},sip,,1,freenum.org)})     ; perform our lookup with freenum.org
-same => n,GotoIf($["${isnresult}" != ""]?:notfound)
-same => n,GotoIf($["${GLOBAL(FREENUMDOMAIN)}" == ""]?dial:)             ; check if we set the FREENUMDOMAIN global variable in [global]
+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,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(dial),Dial(SIP/${isnresult},40)
-same => n,Goto(fn-${DIALSTATUS})
+same => n,Goto(fn-${DIALSTATUS},1)
 
 exten => fn-BUSY,1,Busy()
 
-exten => _fn-.,1,NoOp(ISN: ${DIALSTATUS})
+exten => _f[n]-.,1,NoOp(ISN: ${DIALSTATUS})
 same => n,Congestion()
 
 [macro-trunkdial]