upgrade isdn4bsd from version 0.71 to the just released version 0.81

8 files changed, 147 insertions, 80 deletions

diff --git a/etc/isdn/Makefile b/etc/isdn/Makefile
index c24ffba..e5f5230 100644
--- a/etc/isdn/Makefile
+++ b/etc/isdn/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/01/10 14:30:44 hm Exp $
+#	$Id: Makefile,v 1.2 1999/01/19 15:33:15 hm Exp $
 
 I4BETCPROG=	answer		\
 		isdntel.sh	\
@@ -6,9 +6,10 @@ I4BETCPROG=	answer		\
 		tell		\
 		tell-record
 
-I4BETCFILE=	isdnd.rates.D	\
-		isdnd.rates.F	\
-		isdnd.rc.sample	\
+I4BETCFILE=	isdnd.rates.D		\
+		isdnd.rates.F		\
+		isdnd.rates.UK.BT	\
+		isdnd.rc.sample		\
 		isdntel.alias.sample
 
 install:
diff --git a/etc/isdn/answer b/etc/isdn/answer
index b785fc0..4a023cb 100755
--- a/etc/isdn/answer
+++ b/etc/isdn/answer
@@ -4,13 +4,18 @@
 #	answer script for i4b isdnd
 #	---------------------------
 #
-#	$Id: answer,v 1.3 1998/12/18 17:17:57 hm Exp $
+#	$Id: answer,v 1.5 1999/04/23 09:42:05 hm Exp $
 #
-#	last edit-date: [Fri Dec 18 18:05:20 1998]
+#	last edit-date: [Thu May 20 11:44:38 1999]
 #
 #---------------------------------------------------------------------------
 VARDIR=/var/isdn
-LIBDIR=/usr/local/lib/isdn
+
+#FreeBSD < 3.1, NetBSD, OpenBSD, BSD/OS
+#LIBDIR=/usr/local/lib/isdn
+#FreeBSD 3.1 and up
+LIBDIR=/usr/share/isdn
+
 LOGFILE=/tmp/answer.log
 NCALLFILE=$VARDIR/ncall
 DATE=`date +%d%H`
@@ -86,17 +91,17 @@ then
 	echo "To: $DEST" >> $VARDIR/I.$NCALL.$DATE
 fi
 
-if [ -f $LIBDIR/beep.g711a ]
+if [ -f $LIBDIR/beep.al ]
 then
-	dd of=$DEVICE if=$LIBDIR/beep.g711a bs=2k # >/dev/null 2>&1
+	dd of=$DEVICE if=$LIBDIR/beep.al bs=2k # >/dev/null 2>&1
 fi
 
-if [ -f $LIBDIR/msg.g711a ]
+if [ -f $LIBDIR/msg.al ]
 then
-	dd of=$DEVICE if=$LIBDIR/msg.g711a bs=2k # >/dev/null 2>&1
-	if [ -f $LIBDIR/beep.g711a ]
+	dd of=$DEVICE if=$LIBDIR/msg.al bs=2k # >/dev/null 2>&1
+	if [ -f $LIBDIR/beep.al ]
 	then
-		dd of=$DEVICE if=$LIBDIR/beep.g711a bs=2k # >/dev/null 2>&1
+		dd of=$DEVICE if=$LIBDIR/beep.al bs=2k # >/dev/null 2>&1
 	fi
 fi
 
diff --git a/etc/isdn/isdnd.rates.D b/etc/isdn/isdnd.rates.D
index 63fb84e..447d5fc 100644
--- a/etc/isdn/isdnd.rates.D
+++ b/etc/isdn/isdnd.rates.D
@@ -3,31 +3,30 @@
 #	i4b - Deutsche Telekom charging rates config file
 #	-------------------------------------------------
 #
-#	$Id: isdnd.rates.D,v 1.4 1998/12/18 17:17:57 hm Exp $
+#	$Id: isdnd.rates.D,v 1.5 1999/01/17 17:40:33 hm Exp $
 #
-#	last edit-date: [Fri Dec 18 18:05:48 1998]
+#	last edit-date: [Sun Jan 17 18:38:29 1999]
 #
-#	-hm	updated to reflect last Telekom changes as of 1.7.97
-#	-hm	updated to reflect last Telekom changes as of 1.3.98
+#	-hm	updated to reflect last Telekom changes as of 1.1.99
 #
 #---------------------------------------------------------------------------
 #
-#	reference: http://www.telekom.de/aktuell/tarife98
+#	reference: http://www.telekom.de/untern/tarife/inland/index.htm
 #
 #---------------------------------------------------------------------------
 #
 #	Syntax:
 #	-------
-#	rate-code: ra0 = CityCall, ra1 = RegioCall, ra2 = GermanCall
+#	rate-code: ra0 = City, ra1 = Deutschland
 # 	Day-No:    0-6, where 0 = Sunday, 1 = Monday, etc.
 #	Rate:      start_hour.minutes-end_hour.minutes:period in seconds
 #
 #------------------------------------------------------------------------------
 #
-#=================== CityCall =========================================================================
+#=================== T-ISDN City =============================================================
 #
 #rate-code Day rate1           rate2           rate3           rate4           rate5          
-#--------- --- --------------- --------------- --------------- --------------- ----------------
+#--------- --- --------------- --------------- --------------- --------------- ---------------
 ra0        0   00.00-05.00:240 05.00-21.00:150 21.00-24.00:240
 ra0        1   00.00-05.00:240 05.00-09.00:150 09.00-18.00:90  18.00-21.00:150 21.00-24.00:240
 ra0        2   00.00-05.00:240 05.00-09.00:150 09.00-18.00:90  18.00-21.00:150 21.00-24.00:240
@@ -36,28 +35,16 @@ ra0        4   00.00-05.00:240 05.00-09.00:150 09.00-18.00:90  18.00-21.00:150 2
 ra0        5   00.00-05.00:240 05.00-09.00:150 09.00-18.00:90  18.00-21.00:150 21.00-24.00:240
 ra0        6   00.00-05.00:240 05.00-21.00:150 21.00-24.00:240
 #
-#=================== RegioCall ======================================================================================================
-#
-#rate-code Day rate1           rate2           rate3           rate4           rate5           rate6           rate7
-#--------- --- --------------- --------------- --------------- --------------- --------------- --------------- --------------
-ra1        0   00.00-05.00:60  05.00-21.00:45  21.00-24.00:60
-ra1        1   00.00-02.00:60  02.00-05.00:120 05.00-09.00:45  09.00-12.00:26  12.00-18.00:30  18.00-21.00:45  21.00-24.00:60
-ra1        2   00.00-02.00:60  02.00-05.00:120 05.00-09.00:45  09.00-12.00:26  12.00-18.00:30  18.00-21.00:45  21.00-24.00:60
-ra1        3   00.00-02.00:60  02.00-05.00:120 05.00-09.00:45  09.00-12.00:26  12.00-18.00:30  18.00-21.00:45  21.00-24.00:60
-ra1        4   00.00-02.00:60  02.00-05.00:120 05.00-09.00:45  09.00-12.00:26  12.00-18.00:30  18.00-21.00:45  21.00-24.00:60
-ra1        5   00.00-02.00:60  02.00-05.00:120 05.00-09.00:45  09.00-12.00:26  12.00-18.00:30  18.00-21.00:45  21.00-24.00:60
-ra1        6   00.00-05.00:60  05.00-21.00:45  21.00-24.00:60
-#
-#================== GermanCall ======================================================================================================
-#
-#rate-code Day rate1           rate2           rate3           rate4           rate5           rate 6          rate7
-#--------- --- --------------- --------------- --------------  --------------- --------------  --------------- ----------------
-ra2        0   00.00-05.00:36  05.00-21.00:30  21.00-24.00:36
-ra2        1   00.00-02.00:36  02.00-05.00:120 05.00-09.00:22  09.00-12.00:13  12.00-18.00:14  18.00-21.00:22  21.00-24.00:36
-ra2        2   00.00-02.00:36  02.00-05.00:120 05.00-09.00:22  09.00-12.00:13  12.00-18.00:14  18.00-21.00:22  21.00-24.00:36
-ra2        3   00.00-02.00:36  02.00-05.00:120 05.00-09.00:22  09.00-12.00:13  12.00-18.00:14  18.00-21.00:22  21.00-24.00:36
-ra2        4   00.00-02.00:36  02.00-05.00:120 05.00-09.00:22  09.00-12.00:13  12.00-18.00:14  18.00-21.00:22  21.00-24.00:36
-ra2        5   00.00-02.00:36  02.00-05.00:120 05.00-09.00:22  09.00-12.00:13  12.00-18.00:14  18.00-21.00:22  21.00-24.00:36
-ra2        6   00.00-05.00:36  05.00-21.00:30  21.00-24.00:36
-#
-#================== EOF ============================================================================================================
+#=================== T-ISDN Deutschland ======================================================
+#
+#rate-code Day rate1           rate2           rate3           rate4           rate5          
+#--------- --- --------------- --------------- --------------- --------------- ---------------
+ra1        0   00.00-24.00:60
+ra1        1   00.00-02.00:60  02.00-05.00:120 05.00-09.00:60  09.00-18.00:30  18.00-24.00:60
+ra1        2   00.00-02.00:60  02.00-05.00:120 05.00-09.00:60  09.00-18.00:30  18.00-24.00:60
+ra1        3   00.00-02.00:60  02.00-05.00:120 05.00-09.00:60  09.00-18.00:30  18.00-24.00:60
+ra1        4   00.00-02.00:60  02.00-05.00:120 05.00-09.00:60  09.00-18.00:30  18.00-24.00:60
+ra1        5   00.00-02.00:60  02.00-05.00:120 05.00-09.00:60  09.00-18.00:30  18.00-24.00:60
+ra1        6   00.00-24.00:60
+#
+#================== EOF ======================================================================
diff --git a/etc/isdn/isdnd.rates.UK.BT b/etc/isdn/isdnd.rates.UK.BT
new file mode 100644
index 0000000..ba17f6e
--- /dev/null
+++ b/etc/isdn/isdnd.rates.UK.BT
@@ -0,0 +1,59 @@
+#---------------------------------------------------------------------------
+#
+#	i4b - BT charges
+#	-------------------------------------------------
+#
+#	Barry A. Scott barry@scottb.demon.co.uk
+#
+#---------------------------------------------------------------------------
+#
+#	reference: http://www.bt.com/Business/price_frm.htm
+#	(I use the bussiness figures as the Ex VAT gives more
+#	accurate rate data because BT round the Inc VAT figures)
+#
+#---------------------------------------------------------------------------
+#
+#	Syntax:
+#	-------
+#	rate-code: ra0 = Local, ra1 = Regional, ra2 = National
+# 	Day-No:    0-6, where 0 = Sunday, 1 = Monday, etc.
+#	Rate:      start_hour.minutes-end_hour.minutes:period in seconds
+#
+#------------------------------------------------------------------------------
+#
+#=================== Local =========================================================================
+#
+#rate-code Day rate1           rate2           rate1
+#--------- --- --------------- --------------- ---------------
+ra0        0   00.00-24.00:296
+ra0        1   00.00-08.00:200 08.00-18.00:75  18.00-00.00:200
+ra0        2   00.00-08.00:200 08.00-18.00:75  18.00-00.00:200
+ra0        3   00.00-08.00:200 08.00-18.00:75  18.00-00.00:200
+ra0        4   00.00-08.00:200 08.00-18.00:75  18.00-00.00:200
+ra0        5   00.00-08.00:200 08.00-18.00:75  18.00-00.00:200
+ra0        6   00.00-24.00:296
+#
+#=================== Regional =========================================================================
+#
+#rate-code Day rate1           rate2           rate1
+#--------- --- --------------- --------------- ---------------
+ra1        0   00.00-24.00:100
+ra1        1   00.00-08.00:75  08.00-18.00:37  18.00-00.00:75
+ra1        2   00.00-08.00:75  08.00-18.00:37  18.00-00.00:75
+ra1        3   00.00-08.00:75  08.00-18.00:37  18.00-00.00:75
+ra1        4   00.00-08.00:75  08.00-18.00:37  18.00-00.00:75
+ra1        5   00.00-08.00:75  08.00-18.00:37  18.00-00.00:75
+ra1        6   00.00-24.00:100
+#
+#=================== National =========================================================================
+#
+#rate-code Day rate1           rate2           rate1
+#--------- --- --------------- --------------- ---------------
+ra2        0   00.00-24.00:100
+ra2        1   00.00-08.00:71  08.00-18.00:37  18.00-00.00:71
+ra2        2   00.00-08.00:71  08.00-18.00:37  18.00-00.00:71
+ra2        3   00.00-08.00:71  08.00-18.00:37  18.00-00.00:71
+ra2        4   00.00-08.00:71  08.00-18.00:37  18.00-00.00:71
+ra2        5   00.00-08.00:71  08.00-18.00:37  18.00-00.00:71
+ra2        6   00.00-24.00:100
+#================== EOF ============================================================================================================
diff --git a/etc/isdn/isdntel.sh b/etc/isdn/isdntel.sh
index 6179908..376434e 100755
--- a/etc/isdn/isdntel.sh
+++ b/etc/isdn/isdntel.sh
@@ -4,22 +4,22 @@
 #	isdn telephone answering
 #	-------------------------
 #
-#	$Id: isdntel.sh,v 1.7 1998/12/18 17:17:57 hm Exp $
+#	$Id: isdntel.sh,v 1.9 1999/04/23 09:42:05 hm Exp $
 #
-#	last edit-date: [Fri Dec 18 18:05:26 1998]
-#
-#	-hm	answering script
-#	-hm	curses interface
-#	-hm	update for release
+#	last edit-date: [Thu May 20 11:45:04 1999]
 #
 #---------------------------------------------------------------------------
-LIBDIR=/usr/local/lib/isdn
+#FreeBSD < 3.1, NetBSD, OpenBSD, BSD/OS
+#LIBDIR=/usr/local/lib/isdn
+#FreeBSD 3.1 and up
+LIBDIR=/usr/share/isdn
+
 VARDIR=/var/isdn
 DEVICE=/dev/i4btel0
 
 # sounds 
-MESSAGE=$LIBDIR/msg.g711a
-BEEP=$LIBDIR/beep.g711a
+MESSAGE=$LIBDIR/msg.al
+BEEP=$LIBDIR/beep.al
 
 # dd options
 SKIP=25
diff --git a/etc/isdn/record b/etc/isdn/record
index 782f0f5..f60a7c2 100755
--- a/etc/isdn/record
+++ b/etc/isdn/record
@@ -4,13 +4,18 @@
 #	answer and record message script for i4b isdnd
 #	----------------------------------------------
 #
-#	$Id: record,v 1.3 1998/12/18 17:17:57 hm Exp $
+#	$Id: record,v 1.5 1999/04/23 09:42:05 hm Exp $
 #
-#	last edit-date: [Fri Dec 18 18:05:31 1998]
+#	last edit-date: [Thu May 20 11:45:10 1999]
 #
 #---------------------------------------------------------------------------
 VARDIR=/var/isdn
-LIBDIR=/usr/local/lib/isdn
+
+#FreeBSD < 3.1, NetBSD, OpenBSD, BSD/OS
+#LIBDIR=/usr/local/lib/isdn
+#FreeBSD 3.1 and up
+LIBDIR=/usr/share/isdn
+
 LOGFILE=/tmp/answer.log
 NCALLFILE=$VARDIR/ncall
 DATE=`date +%d%H`
@@ -86,19 +91,19 @@ then
 	echo "To: $DEST" >> $VARDIR/I.$NCALL.$DATE
 fi
 
-if [ -f $LIBDIR/beep.g711a ]
+if [ -f $LIBDIR/beep.al ]
 then
-	dd of=$DEVICE if=$LIBDIR/beep.g711a bs=2k >/dev/null 2>&1 
+	dd of=$DEVICE if=$LIBDIR/beep.al bs=2k >/dev/null 2>&1 
 fi
 
-if [ -f $LIBDIR/msg.g711a ]
+if [ -f $LIBDIR/msg.al ]
 then
-	dd of=$DEVICE if=$LIBDIR/msg.g711a bs=2k >/dev/null 2>&1
+	dd of=$DEVICE if=$LIBDIR/msg.al bs=2k >/dev/null 2>&1
 fi
 
-if [ -f $LIBDIR/beep.g711a ]
+if [ -f $LIBDIR/beep.al ]
 then
-	dd of=$DEVICE if=$LIBDIR/beep.g711a bs=2k >/dev/null 2>&1
+	dd of=$DEVICE if=$LIBDIR/beep.al bs=2k >/dev/null 2>&1
 fi
 
 dd if=$DEVICE of=$VARDIR/R.$NCALL.$DATE bs=2k >/dev/null 2>&1
diff --git a/etc/isdn/tell b/etc/isdn/tell
index 4b29c22..12b4af2 100755
--- a/etc/isdn/tell
+++ b/etc/isdn/tell
@@ -4,13 +4,18 @@
 #	tell called and calling numbers answer script for i4b isdnd
 #	-----------------------------------------------------------
 #
-#	$Id: tell,v 1.3 1998/12/18 17:17:57 hm Exp $
+#	$Id: tell,v 1.5 1999/04/23 09:42:05 hm Exp $
 #
-#	last edit-date: [Fri Dec 18 18:05:36 1998]
+#	last edit-date: [Thu May 20 11:45:15 1999]
 #
 #---------------------------------------------------------------------------
 VARDIR=/var/isdn
-LIBDIR=/usr/local/lib/isdn
+
+#FreeBSD < 3.1, NetBSD, OpenBSD, BSD/OS
+#LIBDIR=/usr/local/lib/isdn
+#FreeBSD 3.1 and up
+LIBDIR=/usr/share/isdn
+
 LOGFILE=/tmp/answer.log
 NCALLFILE=$VARDIR/ncall
 DATE=`date +%d%H`
@@ -65,9 +70,9 @@ fi
 
 echo "answer: device $DEVICE destination $DEST source $SRC " >>$LOGFILE
 
-if [ -f $LIBDIR/beep.g711a ]
+if [ -f $LIBDIR/beep.al ]
 then
-	dd of=$DEVICE if=$LIBDIR/beep.g711a bs=2k >/dev/null 2>&1
+	dd of=$DEVICE if=$LIBDIR/beep.al bs=2k >/dev/null 2>&1
 fi
 
 # tell the caller the number he is calling from
@@ -78,7 +83,7 @@ LENGTH=`expr $SRC : '.*'`
 while :
 do
 	DIGIT=`echo $SRC | cut -c $POS`
-	/bin/dd of=$DEVICE if=$LIBDIR/$DIGIT.g711a bs=2k >/dev/null 2>&1
+	/bin/dd of=$DEVICE if=$LIBDIR/$DIGIT.al bs=2k >/dev/null 2>&1
 	POS=`expr $POS + 1`
 	if [ $POS -gt $LENGTH ]
 	then
@@ -86,7 +91,7 @@ do
 	fi
 done
 
-if [ -f $LIBDIR/beep.g711a ]
+if [ -f $LIBDIR/beep.al ]
 then
-	dd of=$DEVICE if=$LIBDIR/beep.g711a bs=2k >/dev/null 2>&1
+	dd of=$DEVICE if=$LIBDIR/beep.al bs=2k >/dev/null 2>&1
 fi
diff --git a/etc/isdn/tell-record b/etc/isdn/tell-record
index 9c66c70..ba02145 100755
--- a/etc/isdn/tell-record
+++ b/etc/isdn/tell-record
@@ -4,13 +4,18 @@
 #	tell called and calling numbers answer script for i4b isdnd
 #	-----------------------------------------------------------
 #
-#	$Id: tell-record,v 1.3 1998/12/18 17:17:57 hm Exp $
+#	$Id: tell-record,v 1.5 1999/04/23 09:42:05 hm Exp $
 #
-#	last edit-date: [Fri Dec 18 18:05:41 1998]
+#	last edit-date: [Thu May 20 11:45:21 1999]
 #
 #---------------------------------------------------------------------------
 VARDIR=/var/isdn
-LIBDIR=/usr/local/lib/isdn
+
+#FreeBSD < 3.1, NetBSD, OpenBSD, BSD/OS
+#LIBDIR=/usr/local/lib/isdn
+#FreeBSD 3.1 and up
+LIBDIR=/usr/share/isdn
+
 LOGFILE=/tmp/answer.log
 NCALLFILE=$VARDIR/ncall
 DATE=`date +%d%H`
@@ -65,9 +70,9 @@ fi
 
 echo "answer: device $DEVICE destination $DEST source $SRC " >>$LOGFILE
 
-if [ -f $LIBDIR/beep.g711a ]
+if [ -f $LIBDIR/beep.al ]
 then
-	dd of=$DEVICE if=$LIBDIR/beep.g711a bs=2k >/dev/null 2>&1
+	dd of=$DEVICE if=$LIBDIR/beep.al bs=2k >/dev/null 2>&1
 fi
 
 # tell the caller the number he is calling from
@@ -78,7 +83,7 @@ LENGTH=`expr $SRC : '.*'`
 while :
 do
 	DIGIT=`echo $SRC | cut -c $POS`
-	/bin/dd of=$DEVICE if=$LIBDIR/$DIGIT.g711a bs=2k >/dev/null 2>&1
+	/bin/dd of=$DEVICE if=$LIBDIR/$DIGIT.al bs=2k >/dev/null 2>&1
 	POS=`expr $POS + 1`
 	if [ $POS -gt $LENGTH ]
 	then
@@ -86,9 +91,9 @@ do
 	fi
 done
 
-if [ -f $LIBDIR/beep.g711a ]
+if [ -f $LIBDIR/beep.al ]
 then
-	dd of=$DEVICE if=$LIBDIR/beep.g711a bs=2k >/dev/null 2>&1
+	dd of=$DEVICE if=$LIBDIR/beep.al bs=2k >/dev/null 2>&1
 fi
 
 dd if=$DEVICE of=$VARDIR/recorded.msg bs=2k