Changeset 11306

Timestamp:

02/06/11 19:11:54 (2 years ago)

Author:

p_lindheimer

Message:

closes #4799 and closes #4800 adds various CONNECTEDLINE() calls and macro-blkvm-xxxx functions

Files:

• modules/branches/2.9/core/functions.inc.php (modified) (8 diffs)

modules/branches/2.9/core/functions.inc.php

@@ -1364 +1364 @@
-          //
-          $ivr_context = 'from-did-direct-ivr';
-
-
-
-
-
+
-          $ext->add($ivr_context, $exten['extension'],'', new ext_setvar('__NODEST', ''));
-          $ext->add($ivr_context, $exten['extension'],'', new ext_goto('1',$exten['extension'],'from-did-direct'));
-          if($vm != "novm") {
-
-
-
-
-
+
-            $ext->add($ivr_context, '${VM_PREFIX}'.$exten['extension'],'', new ext_setvar('__NODEST', ''));
-            $ext->add($ivr_context, '${VM_PREFIX}'.$exten['extension'],'', new ext_macro('vm',$vm.',DIRECTDIAL,${IVR_RETVM}'));
@@ -1927 +1919 @@
-      }
-      $ext->add($context, $exten, '', new ext_dbdel('RG/${ARG3}/${UNIQCHAN}'));
-dbdel('${BLKVM_OVERRIDE}
+macro('blkvm-clr
-      if ($amp_conf['AST_FUNC_SHARED']) {
-        $ext->add($context, $exten, '', new ext_setvar('SHARED(ANSWER_STATUS,${FORCE_CONFIRM})',''));
@@ -1994 +1986 @@
-      $exten = 's';
-      $ext->add($context, $exten, '', new ext_setvar('__MACRO_RESULT',''));
-dbdel('${BLKVM_OVERRIDE}
+macro('blkvm-clr
-      $ext->add($context, $exten, '', new ext_dbdel('RG/${ARG1}/${UNIQCHAN}'));
-
+
+
+
+
+
-
-      /*
@@ -2011 +2007 @@
-      $exten = 's';
-      $ext->add($context, $exten, '', new ext_setvar('__MACRO_RESULT',''));
-
+
+
+
+
+
+
-
-      /*
@@ -2771 +2772 @@
-      $ext->add('macro-vm','s', '', new ext_setvar("VMGAIN", '${IF($["foo${VM_GAIN}"!="foo"]?"g(${VM_GAIN})":"")}'));
-
-BLKVM_OVERRIDE is set
+blkvm-check is set TRUE
-      // voicemail. This variable is reset by the answering channel so subsequent
-      // transfers will properly function.
-      //
-
+
+
-
-      // we didn't branch so block this from voicemail
-      //
-NoOp('CAME FROM: ${NODEST} - Blocking VM cause of key: ${DB(BLKVM_OVERRIDE)}
+noop_trace('CAME FROM: ${NODEST} - Blocking VM macro-blkvm-check returned TRUE
-      $ext->add('macro-vm','s', '', new ext_hangup(''));
-
@@ -3194 +3196 @@
-
-
+      /* macro-blkvm-setifempty
+       * macro-blkvm-set
+       * macro-blkvm-clr
+       * macro-blkvm-check
+       *
+       * These macros are used to tell the voicemail system if it should answer a call or kill the call.
+       * They are also used by modules like findmefollow and ringgroups to determine if a destination
+       * if noanswer should be pursued, or if they should just end because they were called by a higher
+       * level module who's destination should be honored. (Thus if vm should be blocked, so should
+       * such destinations.
+       *
+       * In the past, it was necessary to create and track unique AstDB variables to track this since
+       * it is necessary for a call that is answered, for example a queue memeber who answers a queue
+       * call, to clr the block so that subsequent transfers to voicemail or user extensions which might
+       * hit voicemail could succeed and the nature of Asterisk inheritable variable did not allow
+       * this. This also meant that these needed to be cleaned up when the master channel who 'started
+       * it all' ended, which is attempted in macro-hangupcall. There are still cases where cleanup
+       * does not happen which can result in an accumulation of these.
+       *
+       * With the advent of the SHARED() channel variable starting in 1.6, we can achieve the same
+       * thing with such a SHARED() channel variable which should be more efficient since it does not
+       * hit the DB, but more importantly, there is no cleanup because the variable will die with the
+       * owner channel.
+       *
+       * We check if the SHARED function is availalbe and if so, we use that in our macro. If not, we
+       * fall back to the shared DB variable and keep our cleanup code in hangupcall.
+       *
+       * Note that we have chosen to use a Macro() in place of a GoSub() because in the legacy DB
+       * mode we must have the owning ${EXTEN} to create our unique key. Since GoSub() does not support
+       * passing arguments until 1.6 this would not be possible in 1.4 which is still mainstream.
+       * We have chosen to use the GOSUB_RETVAL in anticipation of a future point where we move to
+       * a GoSub() call which would be slightly more efficient.
+       */
+
+      if ($amp_conf['AST_FUNC_SHARED']) {
+        $exten = 's';
+
+        // If it BLKVM_CHANNEL exists, return it's value. If not, then set it and return TRUE
+        //
+        $mcontext = 'macro-blkvm-setifempty';
+        $ext->add($mcontext,$exten,'', new ext_gotoif('$[!${EXISTS(${BLKVM_CHANNEL})}]', 'init'));
+        $ext->add($mcontext,$exten,'', new ext_set('GOSUB_RETVAL','${SHARED(BLKVM,${BLKVM_CHANNEL})}'));
+        $ext->add($mcontext,$exten,'', new ext_macroexit(''));
+        $ext->add($mcontext,$exten,'init', new ext_set('__BLKVM_CHANNEL','${CHANNEL}'));
+        $ext->add($mcontext,$exten,'', new ext_set('SHARED(BLKVM,${BLKVM_CHANNEL})','TRUE'));
+        $ext->add($mcontext,$exten,'', new ext_set('GOSUB_RETVAL','TRUE'));
+        $ext->add($mcontext,$exten,'', new ext_macroexit(''));
+
+        // If BLKVM_CHANNEL not set or 'reset' is passed, then initialize it to this channel then set and retrun TRUE
+        //
+        $mcontext = 'macro-blkvm-set';
+        $ext->add($mcontext,$exten,'', new ext_execif('$[!${EXISTS(${BLKVM_CHANNEL})} | "{ARG1}" = "reset"]', 'Set','__BLKVM_CHANNEL=${CHANNEL}'));
+        $ext->add($mcontext,$exten,'', new ext_set('SHARED(BLKVM,${BLKVM_CHANNEL})','TRUE'));
+        $ext->add($mcontext,$exten,'', new ext_set('GOSUB_RETVAL','TRUE'));
+        $ext->add($mcontext,$exten,'', new ext_macroexit(''));
+
+        // if clearing, BLKVM_CHANNEL should already exist (if not, we clear our channel's copy)
+        //
+        $mcontext = 'macro-blkvm-clr';
+        $ext->add($mcontext,$exten,'', new ext_set('SHARED(BLKVM,${BLKVM_CHANNEL})',''));
+        $ext->add($mcontext,$exten,'', new ext_set('GOSUB_RETVAL',''));
+        $ext->add($mcontext,$exten,'', new ext_macroexit(''));
+
+        // if checking, BLKVM_CHANNEL should already exist (if not, we check our channel's copy)
+        //
+        $mcontext = 'macro-blkvm-check';
+        $ext->add($mcontext,$exten,'', new ext_set('GOSUB_RETVAL','${SHARED(BLKVM,${BLKVM_CHANNEL})}'));
+        $ext->add($mcontext,$exten,'', new ext_macroexit(''));
+
+      } else { // NO SHARED()
+        
+        // If it BLKVM_OVERRIDE exists, return it's value. If not, then set it and return TRUE
+        //
+        $mcontext = 'macro-blkvm-setifempty';
+        $ext->add($mcontext,$exten,'', new ext_gotoif('$[!${EXISTS(${BLKVM_OVERRIDE})}]', 'init'));
+        $ext->add($mcontext,$exten,'', new ext_set('GOSUB_RETVAL','${DB(${BLKVM_OVERRIDE})}'));
+        $ext->add($mcontext,$exten,'', new ext_macroexit(''));
+        $ext->add($mcontext,$exten,'init', new ext_set('__BLKVM_OVERRIDE','BLKVM/${MACRO_EXTEN}/${CHANNEL}'));
+        $ext->add($mcontext,$exten,'', new ext_set('__BLKVM_BASE','${MACRO_EXTEN}'));
+        $ext->add($mcontext,$exten,'', new ext_set('DB(${BLKVM_OVERRIDE})','TRUE'));
+
+        $ext->add($mcontext,$exten,'', new ext_set('GOSUB_RETVAL','TRUE'));
+        $ext->add($mcontext,$exten,'', new ext_macroexit(''));
+
+        // If BLKVM_OVERRIDE not set or 'reset' is passed, then initialize it to this channel then set and retrun TRUE
+        //
+        $mcontext = 'macro-blkvm-set';
+        $ext->add($mcontext,$exten,'', new ext_execif('$[!${EXISTS(${BLKVM_OVERRIDE})} | "{ARG1}" = "reset"]', 'Set','__BLKVM_BASE=${MACRO_EXTEN}'));
+        $ext->add($mcontext,$exten,'', new ext_execif('$[!${EXISTS(${BLKVM_OVERRIDE})} | "{ARG1}" = "reset"]', 'Set','__BLKVM_OVERRIDE=BLKVM/${MACRO_EXTEN}/${CHANNEL}'));
+        $ext->add($mcontext,$exten,'', new ext_set('DB(${BLKVM_OVERRIDE})','TRUE'));
+        $ext->add($mcontext,$exten,'', new ext_set('GOSUB_RETVAL','TRUE'));
+        $ext->add($mcontext,$exten,'', new ext_macroexit(''));
+
+        // if clearing, BLKVM_OVERRIDE should already exist (if not, it's already cleared anyhow)
+        //
+        $mcontext = 'macro-blkvm-clr';
+        $ext->add($mcontext,$exten,'', new ext_gotoif('$[!${EXISTS(${BLKVM_OVERRIDE})}]', 'ret'));
+        $ext->add($mcontext,$exten,'', new ext_dbdel('${BLKVM_OVERRIDE}'));
+        $ext->add($mcontext,$exten,'ret', new ext_set('GOSUB_RETVAL',''));
+        $ext->add($mcontext,$exten,'', new ext_macroexit(''));
+
+        // if checking, BLKVM_OVERRIDE should already exist (if not, '' will be returned)
+        //
+        $mcontext = 'macro-blkvm-check';
+        $ext->add($mcontext,$exten,'', new ext_set('GOSUB_RETVAL','${DB(${BLKVM_OVERRIDE})}'));
+        $ext->add($mcontext,$exten,'', new ext_macroexit(''));
+      }
+
-      $mcontext = 'macro-hangupcall';
-      $exten = 's';
@@ -3199 +3309 @@
-      ; Cleanup any remaining RG flag
-      */
-
+
+
-      $ext->add($mcontext,$exten,'', new ext_noop_trace('Cleaning Up Confirmation Flag: RG/${RINGGROUP_INDEX}/${CHANNEL}'));
-      $ext->add($mcontext,$exten,'delrgi', new ext_dbdel('RG/${RINGGROUP_INDEX}/${CHANNEL}'));
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-      /*
-      ; Cleanup any remaining FollowMe DND flags
-      */
-'skipblkvm'
+$skip_label
-      $ext->add($mcontext,$exten,'delfmrgp', new ext_dbdel('FM/DND/${FMGRP}/${CHANNEL}'));
-      $ext->add($mcontext,$exten,'theend', new ext_hangup());
@@ -3275 +3389 @@
-        $ext->add($mcontext,$exten,'', new ext_gotoif('$["${USEGOTO}"="1"]','usegoto,1'));
-
-
+
+
+
+
+
+
+
+
+
+
+
-        $ext->add($mcontext,$exten,'', new ext_execif('$["${DIALSTATUS_CW}"!=""]', 'Set', 'DIALSTATUS=${DIALSTATUS_CW}'));
-        $ext->add($mcontext,$exten,'', new ext_gosubif('$["${SCREEN}"!=""|"${DIALSTATUS}"="ANSWER"]','s-${DIALSTATUS},1'));