net/asterisk/Makefile

@@ -13,7 +13,7 @@ PKG_RELEASE:=2
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=e1b78dd0e1f6f6cf0d773500717b59533b7db029
+PKG_SOURCE_VERSION:=4c3c6bb5e7daf2be113836cb887e4901aed00b05
 PKG_SOURCE:=asterisk-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/asterisk.git
 PKG_SOURCE_PROTO:=git

net/asterisk/files/iopsys/lib/voice/config_asterisk.sh

@@ -960,7 +960,8 @@ configure_extensions_provider() {
         echo "exten => $user,n,GotoIf($[$[\"\${CALLERID(NUM):0:1}\"] = \"+\"]?write:ignore)" >> $tmp
         echo "exten => $user,n(write),Set(CALLERID(num)=00\${CALLERID(num):1})" >>           $tmp
         echo "exten => $user,n(ignore),NoOp()"                                    >>           $tmp
-
+	# check if it is external call back
+        echo "exten => $user,n,GoSub(sub-$1-ccbs-external,s,1)"							>> $tmp
 	# read a list of lines that should be dialled on incoming calls
 	config_get call_queue $1 call_queue
 	config_get call_ivr $1 call_ivr
@@ -1065,7 +1066,7 @@ configure_feature_set(){
         local cbbs_maxretry
         local cbbs_retrytime
         local cbbs_waittime
-        local cbbbs_enable
+        local ccbs_enable
         local cfim_on
         local cfim_off
         local cfbs_on
@@ -1309,15 +1310,20 @@ configure_feature_set(){
 		echo "" >>							$tmp
 	    fi
         fi
+		# add sub call back checker
+		echo "[sub-$provider-ccbs-external]" >> $tmp
+		echo "exten => s,1,NoOp()"							>> $tmp
         if [ "$ccbs_enable" == "1" -a "$internal_service" == "0" ] ; then
 		# detect ringback call and update caller id
-		local ringback_header="<http://www.uktel.org.uk/SIPAlertInfoExtns?RC03>"
+			local ringback_header="<http://www.uktel.org.uk/SIPAlertInfoExtns?RC03>"
 
-		echo "exten => $user,n,Set(header=\${PJSIP_HEADER(read,Alert-Info,1)})"					>> $tmp
-		echo "exten => $user,n,GotoIf(\$[\"\${header}\" = \"${ringback_header}\"]?ringback:noringback)"	>> $tmp
-		echo "exten => $user,n(ringback),Set(CALLERID(name)=RINGBACK)"					>> $tmp
-		echo "exten => $user,n(noringback),NoOp()"							>> $tmp
-	fi
+			echo "exten => s,n,Set(header=\${PJSIP_HEADER(read,Alert-Info,1)})"					>> $tmp
+			echo "exten => s,n,GotoIf(\$[\"\${header}\" = \"${ringback_header}\"]?ringback:noringback)"	>> $tmp
+			echo "exten => s,n(ringback),Set(CALLERID(name)=RINGBACK)"					>> $tmp
+			echo "exten => s,n(noringback),NoOp()"							>> $tmp
+		fi
+		echo "exten => s,n,Return()"							>> $tmp
+		echo "" >>							$tmp
         cat $tmp  >>           $WORK_DIR/extensions.conf
         rm -f                   $tmp
         if [ -z "$call_waiting_enable" ] ; then