Changeset 3186 for freepbx

Timestamp:

11/25/06 14:09:48 (6 years ago)

Author:

p_lindheimer

Message:

#1423: add a TTL (internet style) to macro-user-callerid to put a limit on infinite loop forwarding conditions. Includes a SKIPTTL optional parmater for places in the core dialplan where macro-user-callerid is called where no such condition could exist, such as outbound dialing, currently hardcoded at 64 - we probably want to make this settable from General or similar

Files:

• freepbx/trunk/amp_conf/astetc/extensions.conf (modified) (10 diffs)

freepbx/trunk/amp_conf/astetc/extensions.conf

@@ -140 +140 @@
-
-[macro-vm]
-
+,SKIPTTL
-exten => s,n,Set(VMGAIN=${IF($["foo${VM_GAIN}"!="foo"]?"g(${VM_GAIN})":"")})
-exten => s,n,Goto(s-${ARG2},1)
@@ -195 +195 @@
-;------------------------------------------------------------------------
-[macro-simple-dial]
-)
+,SKIPTTL) ; already called from follow-me
-
-; FROMCONTEXT was in the original macro-exten-vm where this macro was derived from. A
@@ -271 +271 @@
-; 4 - extension list
-[macro-rg-group]
-)
+,SKIPTTL) ; already called from ringgroup
-exten => s,2,GotoIf($["${CALLERID(name):0:${LEN(${RGPREFIX})}}" != "${RGPREFIX}"]?4:3)  ; check for old prefix
-exten => s,3,Set(CALLERID(name)=${CALLERID(name):${LEN(${RGPREFIX})}}) ; strip off old prefix
@@ -315 +315 @@
-; dialout and strip the prefix
-[macro-dialout]
-
+,SKIPTTL
-exten => s,2,GotoIf($["${ECID${CALLERID(number)}}" = ""]?5)   ;check for CID override for exten
-exten => s,3,Set(CALLERID(all)=${ECID${CALLERID(number)}})
@@ -330 +330 @@
-; dialout using default OUT trunk - no prefix
-[macro-dialout-default]
-
+,SKIPTTL
-exten => s,2,Macro(record-enable,${CALLERID(number)},OUT)
-exten => s,3,Macro(outbound-callerid,${ARG1})
@@ -362 +362 @@
-exten => s,n(auth),Authenticate(${ROUTE_PASSWD})
-exten => s,n(noauth),Set(GROUP()=OUT_${DIAL_TRUNK})
-
+,SKIPTTL
-exten => s,n,Macro(record-enable,${CALLERID(number)},OUT)
-exten => s,n,GotoIf($["${INTRACOMPANYROUTE}" = "YES"]?skipoutcid) ;Set to YES if treated like internal
@@ -404 +404 @@
-[macro-agent-add]
-exten => s,1,Wait(1)
-
+,SKIPTTL
-exten => s,3,Read(CALLBACKNUM,agent-user)   ; get callback number from user
-exten => s,4,GotoIf($["${CALLBACKNUM}" = ""]?5:7) ; if user just pressed # or timed out, use cidnum
@@ -421 +421 @@
-[macro-agent-del]
-exten => s,1,Wait(1)
-
+,SKIPTTL
-exten => s,3,Read(CALLBACKNUM,agent-user)   ; get callback number from user
-exten => s,4,GotoIf($["${CALLBACKNUM}" = ""]?5:7) ; if user just pressed # or timed out, use cidnum
@@ -440 +440 @@
-exten => s,1,GotoIf($["${ARG3}" = ""]PASSWD?NOPASSWD); arg3 is pattern password 
-exten => s,n(PASSWD),Authenticate(${ARG3}) 
-
+,SKIPTTL
-exten => s,n,Macro(record-enable,${CALLERID(number)},OUT)
-exten => s,n,Macro(outbound-callerid,${ARG1})
@@ -707 +707 @@
-exten => s,n,GotoIf($["x${AMPUSERCIDNAME:1:2}" = "x"]?report) 
-exten => s,n,Set(CALLERID(all)=${AMPUSERCIDNAME} <${AMPUSER}>)
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-; overrides callerid out trunks