[zaptel-commits] tzafrir: trunk r1681 - in /trunk/xpp: ./ utils/genzaptelconf

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Thu Nov 30 23:29:42 2006
New Revision: 1681

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1681
Log:
 r1667 at boole:  tzafrir | 2006-11-30 23:46:46 +0200
   r2831 at boole:  tzafrir | 2006-11-29 11:05:08 +0200
     genzaptelconf: A list of countries for which to use busydetect.
     (and get genzaptelconf here back in sync)

Modified:
    trunk/xpp/   (props changed)
    trunk/xpp/utils/genzaptelconf

Propchange: trunk/xpp/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Nov 30 23:29:42 2006
@@ -1,7 +1,7 @@
-283159da-0705-0410-b60c-f2062b4bb6ad:/components/xpp-zaptel/branches/RELEASE-1.2.0/xpp:2817
+283159da-0705-0410-b60c-f2062b4bb6ad:/components/xpp-zaptel/branches/RELEASE-1.2.0/xpp:2831
 283159da-0705-0410-b60c-f2062b4bb6ad:/components/xpp-zaptel/trunk/xpp:2600
 
-f558416c-6c06-0410-9f27-dde2687782d0:/branches/1.2/xpp:1666
-f558416c-6c06-0410-9f27-dde2687782d0:/branches/1.4/xpp:1674
+f558416c-6c06-0410-9f27-dde2687782d0:/branches/1.2/xpp:1667
+f558416c-6c06-0410-9f27-dde2687782d0:/branches/1.4/xpp:1675
 
 f558416c-6c06-0410-9f27-dde2687782d0:/team/tzafrir/xpp_1.2/xpp:1554

Modified: trunk/xpp/utils/genzaptelconf
URL: http://svn.digium.com/view/zaptel/trunk/xpp/utils/genzaptelconf?view=diff&rev=1681&r1=1680&r2=1681
==============================================================================
--- trunk/xpp/utils/genzaptelconf (original)
+++ trunk/xpp/utils/genzaptelconf Thu Nov 30 23:29:42 2006
@@ -84,9 +84,9 @@
 # bri:       bri_net; bri_cpe           (Bristuffed Asterisk. No multi- support)
 # bri_ptmpi: bri_net_ptmp; bri_cpe_ptmp (Bristuffed Asterisk, multi- support)
 # pri:       pri_net; pri_cpe           (Recent Asterisk. Experimental)
-#ZAPBRI_SIGNALLING=bri
+ZAPBRI_SIGNALLING=bri
 #ZAPBRI_SIGNALLING=bri_ptmp
-ZAPBRI_SIGNALLING=pri
+#ZAPBRI_SIGNALLING=pri
 
 # read default configuration from /etc/default/zaptel
 if [ -r $ZAPTEL_BOOT_DEBIAN ]; then . $ZAPTEL_BOOT_DEBIAN; fi
@@ -279,9 +279,16 @@
 	local sig=$2 #fxs/fxo
 	local mode=$3
 	local method='ks'
-	if [ "$lc_country" = il ] && [ "$sig" = 'fxs' ]
-	then method=ls
-	fi
+
+	# Coutries in which we need to use busydetect:
+	# United Arab Emirats, Israel, Slovenia
+	case "$lc_country" in
+	ae|il|si) 
+	  if [ "$sig" = 'fxs' ]; then 
+			method=ls
+		fi
+		;;
+	esac
 	case "$mode" in
 	list) echo $chan $sig $astbanktype;;
 	files)