update to isdn4bsd beta release 0.90

3 files changed, 39 insertions, 27 deletions

diff --git a/usr.sbin/i4b/isdntest/Makefile b/usr.sbin/i4b/isdntest/Makefile
index c1240cc..7444055 100644
--- a/usr.sbin/i4b/isdntest/Makefile
+++ b/usr.sbin/i4b/isdntest/Makefile
@@ -1,3 +1,4 @@
+# $FreeBSD$
 PROG	 =	isdntest
 SRCS	 =	main.c
 MAN8	 =	isdntest.8
diff --git a/usr.sbin/i4b/isdntest/isdntest.8 b/usr.sbin/i4b/isdntest/isdntest.8
index 943c451..0f59393 100644
--- a/usr.sbin/i4b/isdntest/isdntest.8
+++ b/usr.sbin/i4b/isdntest/isdntest.8
@@ -22,11 +22,13 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
+.\"	$Id: isdntest.8,v 1.10 1999/12/13 22:11:55 hm Exp $
+.\"
 .\" $FreeBSD$
 .\"
-.\"	last edit-date: [Sun Feb 14 10:21:18 1999]
+.\"	last edit-date: [Mon Dec 13 23:07:23 1999]
 .\"
-.Dd July 9, 1998
+.Dd December 10, 1999
 .Dt ISDNTEST 8
 .Os
 .Sh NAME
@@ -35,9 +37,11 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl c Ar unit
-.Op Fl h
+.Op Fl d Ar level
 .Op Fl i Ar number
+.Op Fl h
 .Op Fl o Ar number
+.Op Fl t Ar num
 .Op Fl w
 .Sh DESCRIPTION
 .Nm isdntest
@@ -56,12 +60,16 @@ The following options are available:
 .Bl -tag -width Ds
 .It Fl c
 Use controller unit number for test.
+.It Fl d
+Set the debugging level
 .It Fl h
 Use HDLC as the B channel layer 1 protocol instead of no protocol.
 .It Fl i
 Use number to verify the incoming number.
 .It Fl o
 Use number as the outgoing number to dial.
+.It Fl t
+Set number of times the test pattern on the B-channel is exchanged
 .It Fl w
 Wait for keyboard input for terminating the call.
 .El
@@ -97,8 +105,8 @@ has to be finished by the user by entering Control-C.
 .Sh FILES
 /dev/i4b
 
-.Sh AUTHORS
+.Sh AUTHOR
 The
 .Nm
-utility and this manpage were written by
-.An Hellmuth Michaelis Aq hm@kts.org
+utility and this manpage were written by 
+.An Hellmuth Michaelis Aq hm@kts.org .
diff --git a/usr.sbin/i4b/isdntest/main.c b/usr.sbin/i4b/isdntest/main.c
index ba29735..d050613 100644
--- a/usr.sbin/i4b/isdntest/main.c
+++ b/usr.sbin/i4b/isdntest/main.c
@@ -27,9 +27,11 @@
  *	main.c - i4b selftest utility
  *	-----------------------------
  *
- * $FreeBSD$ 
+ *	$Id: main.c,v 1.15 1999/12/13 21:25:26 hm Exp $ 
  *
- *      last edit-date: [Fri Jul 30 08:16:37 1999]
+ * $FreeBSD$
+ *
+ *      last edit-date: [Mon Dec 13 21:55:19 1999]
  *
  *---------------------------------------------------------------------------*/
 
@@ -87,6 +89,26 @@ int controller = 0;
 int dotest = 0;
 
 /*---------------------------------------------------------------------------*
+ *	usage display and exit
+ *---------------------------------------------------------------------------*/
+static void
+usage(void)
+{
+	fprintf(stderr, "\n");
+	fprintf(stderr, "isdntest - i4b selftest, version %d.%d.%d, compiled %s %s\n",VERSION, REL, STEP, __DATE__, __TIME__);
+	fprintf(stderr, "usage: isdntest [-c ctrl] [-d level] [-h] [-i telno] [-o telno] [-t num] [-w]\n");
+	fprintf(stderr, "       -c <ctrl>     specify controller to use\n");
+	fprintf(stderr, "       -d <level>    set debug level\n");	
+	fprintf(stderr, "       -h            use HDLC as Bchannel protocol\n");
+	fprintf(stderr, "       -i <telno>    incoming telephone number\n");
+	fprintf(stderr, "       -o <telno>    outgoing telephone number\n");
+	fprintf(stderr, "       -t <num>      send test pattern num times\n");
+	fprintf(stderr, "       -w            wait for keyboard entry to disconnect\n");
+	fprintf(stderr, "\n");
+	exit(1);
+}
+
+/*---------------------------------------------------------------------------*
  *	program entry
  *---------------------------------------------------------------------------*/
 int
@@ -301,25 +323,6 @@ isdnrdhdl(int isdnfd)
 }
 
 /*---------------------------------------------------------------------------*
- *	usage display and exit
- *---------------------------------------------------------------------------*/
-static void
-usage(void)
-{
-	fprintf(stderr, "\n");
-	fprintf(stderr, "isdntest - i4b selftest, version %d.%d.%d, compiled %s %s\n",VERSION, REL, STEP, __DATE__, __TIME__);
-	fprintf(stderr, "usage: isdntest -c <ctrl> -h -i <telno> -o <telno>\n");
-	fprintf(stderr, "       -c <ctrl>     specify controller to use\n");		
-	fprintf(stderr, "       -h            use HDLC as Bchannel protocol\n");
-	fprintf(stderr, "       -i <telno>    incoming telephone number\n");		
-	fprintf(stderr, "       -o <telno>    outgoing telephone number\n");
-	fprintf(stderr, "       -w            wait for keyboard entry to disconnect\n");
-	fprintf(stderr, "       -t num        send test pattern num times\n");	
-	fprintf(stderr, "\n");
-	exit(1);
-}
-
-/*---------------------------------------------------------------------------*
  *	initiate an outgoing connection
  *---------------------------------------------------------------------------*/
 int