diff options
79 files changed, 632 insertions, 442 deletions
diff --git a/usr.sbin/i4b/alawulaw/alaw2ulaw.1 b/usr.sbin/i4b/alawulaw/alaw2ulaw.1 index fea7fa5..a99f3ce 100644 --- a/usr.sbin/i4b/alawulaw/alaw2ulaw.1 +++ b/usr.sbin/i4b/alawulaw/alaw2ulaw.1 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1998, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: alaw2ulaw.1,v 1.3 1998/12/05 18:02:35 hm Exp $ +.\" $Id: alaw2ulaw.1,v 1.4 1999/02/14 09:44:55 hm Exp $ .\" -.\" last edit-date: [Sat Dec 5 17:57:34 1998] +.\" last edit-date: [Sun Feb 14 10:01:36 1999] .\" .\" -hm writing manual pages .\" diff --git a/usr.sbin/i4b/alawulaw/alaw2ulaw.c b/usr.sbin/i4b/alawulaw/alaw2ulaw.c index d13e41d..80f1e19 100644 --- a/usr.sbin/i4b/alawulaw/alaw2ulaw.c +++ b/usr.sbin/i4b/alawulaw/alaw2ulaw.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -28,11 +28,9 @@ * convert a-law / u-law sound files * --------------------------------- * - * last edit-date: [Sat Dec 5 17:57:56 1998] + * last edit-date: [Tue Feb 16 11:23:27 1999] * - * $Id: alaw2ulaw.c,v 1.2 1998/12/05 18:02:36 hm Exp $ - * - * -hm telephony is ready + * $Id: alaw2ulaw.c,v 1.4 1999/02/16 10:40:18 hm Exp $ * *---------------------------------------------------------------------------*/ @@ -41,8 +39,9 @@ #define BUF_SIZ 2048 -unsigned char alaw_ulaw[]; -unsigned char ulaw_alaw[]; +static unsigned char raw_ulaw[]; +static unsigned char ulaw_raw[]; + int main(int argc, char *argv[]) { @@ -58,11 +57,11 @@ int main(int argc, char *argv[]) if(!strcmp(p, "ulaw2alaw")) { - cp = ulaw_alaw; + cp = ulaw_raw; } else if(!strcmp(p, "alaw2ulaw")) { - cp = alaw_ulaw; + cp = raw_ulaw; } else { @@ -78,74 +77,50 @@ int main(int argc, char *argv[]) return(0); } -unsigned char alaw_ulaw[] = { - 0x002a, 0x00a9, 0x005f, 0x00e3, 0x001f, 0x009f, 0x0048, 0x00c8, - 0x0039, 0x00b9, 0x006f, 0x00f7, 0x001f, 0x009f, 0x0055, 0x00d7, - 0x0022, 0x00a1, 0x005b, 0x00dd, 0x001f, 0x009f, 0x0040, 0x00c0, - 0x0031, 0x00b1, 0x0067, 0x00eb, 0x001f, 0x009f, 0x004e, 0x00cf, - 0x002e, 0x00ad, 0x0063, 0x00e7, 0x001f, 0x009f, 0x004c, 0x00cc, - 0x003d, 0x00bd, 0x0077, 0x00ff, 0x001f, 0x009f, 0x0059, 0x00db, - 0x0026, 0x00a5, 0x005d, 0x00df, 0x001f, 0x009f, 0x0044, 0x00c4, - 0x0035, 0x00b5, 0x006b, 0x00ef, 0x001f, 0x009f, 0x0051, 0x00d3, - 0x0028, 0x00a7, 0x005f, 0x00e3, 0x001f, 0x009f, 0x0046, 0x00c6, - 0x0037, 0x00b7, 0x006f, 0x00f7, 0x001f, 0x009f, 0x0053, 0x00d5, - 0x0020, 0x009f, 0x005b, 0x00dd, 0x001f, 0x009f, 0x003f, 0x00bf, - 0x002f, 0x00af, 0x0067, 0x00eb, 0x001f, 0x009f, 0x004d, 0x00ce, - 0x002c, 0x00ab, 0x0063, 0x00e7, 0x001f, 0x009f, 0x004a, 0x00ca, - 0x003b, 0x00bb, 0x0077, 0x00ff, 0x001f, 0x009f, 0x0057, 0x00d9, - 0x0024, 0x00a3, 0x005d, 0x00df, 0x001f, 0x009f, 0x0042, 0x00c2, - 0x0033, 0x00b3, 0x006b, 0x00ef, 0x001f, 0x009f, 0x004f, 0x00d1, - 0x002b, 0x00aa, 0x0063, 0x00e3, 0x001f, 0x009f, 0x0049, 0x00c9, - 0x003a, 0x00ba, 0x0077, 0x00f7, 0x001f, 0x009f, 0x0057, 0x00d7, - 0x0023, 0x00a2, 0x005d, 0x00dd, 0x001f, 0x009f, 0x0041, 0x00c1, - 0x0032, 0x00b2, 0x006b, 0x00eb, 0x001f, 0x009f, 0x004f, 0x00cf, - 0x002f, 0x00ae, 0x0067, 0x00e7, 0x001f, 0x009f, 0x004d, 0x00cd, - 0x003e, 0x00be, 0x00ff, 0x00ff, 0x001f, 0x009f, 0x005b, 0x00db, - 0x0027, 0x00a6, 0x005f, 0x00df, 0x001f, 0x009f, 0x0045, 0x00c5, - 0x0036, 0x00b6, 0x006f, 0x00ef, 0x001f, 0x009f, 0x0053, 0x00d3, - 0x0029, 0x00a8, 0x005f, 0x00e3, 0x001f, 0x009f, 0x0047, 0x00c7, - 0x0038, 0x00b8, 0x006f, 0x00f7, 0x001f, 0x009f, 0x0055, 0x00d5, - 0x0021, 0x00a0, 0x005b, 0x00dd, 0x001f, 0x009f, 0x003f, 0x00bf, - 0x0030, 0x00b0, 0x0067, 0x00eb, 0x001f, 0x009f, 0x004e, 0x00ce, - 0x002d, 0x00ac, 0x0063, 0x00e7, 0x001f, 0x009f, 0x004b, 0x00cb, - 0x003c, 0x00bc, 0x0077, 0x00ff, 0x001f, 0x009f, 0x0059, 0x00d9, - 0x0025, 0x00a4, 0x005d, 0x00df, 0x001f, 0x009f, 0x0043, 0x00c3, - 0x0034, 0x00b4, 0x006b, 0x00ef, 0x001f, 0x009f, 0x0051, 0x00d1 + +/*---------------------------------------------------------------------------* + * Line format to mu-law conversion + *---------------------------------------------------------------------------*/ +static unsigned char raw_ulaw[256] = { + 0x2a, 0xa9, 0x62, 0xe1, 0x0a, 0x8a, 0x48, 0xc8, 0x39, 0xb9, 0x75, 0xf3,0x1a, 0x9a, 0x56, 0xd6, + 0x22, 0xa1, 0x5d, 0xdc, 0x02, 0x82, 0x40, 0xc0, 0x31, 0xb1, 0x6a, 0xe9,0x12, 0x92, 0x4f, 0xcf, + 0x2e, 0xad, 0x66, 0xe5, 0x0e, 0x8e, 0x4c, 0xcc, 0x3d, 0xbd, 0x7d, 0xfb,0x1e, 0x9e, 0x5a, 0xda, + 0x26, 0xa5, 0x5f, 0xde, 0x06, 0x86, 0x44, 0xc4, 0x35, 0xb5, 0x6e, 0xed,0x16, 0x96, 0x52, 0xd2, + 0x28, 0xa7, 0x60, 0xdf, 0x08, 0x88, 0x46, 0xc6, 0x37, 0xb7, 0x71, 0xef,0x18, 0x98, 0x54, 0xd4, + 0x20, 0x9f, 0x5c, 0xdb, 0x00, 0x80, 0x3f, 0xbf, 0x2f, 0xaf, 0x68, 0xe7,0x10, 0x90, 0x4e, 0xce, + 0x2c, 0xab, 0x64, 0xe3, 0x0c, 0x8c, 0x4a, 0xca, 0x3b, 0xbb, 0x79, 0xf7,0x1c, 0x9c, 0x58, 0xd8, + 0x24, 0xa3, 0x5e, 0xdd, 0x04, 0x84, 0x42, 0xc2, 0x33, 0xb3, 0x6c, 0xeb,0x14, 0x94, 0x50, 0xd0, + 0x2b, 0xaa, 0x63, 0xe2, 0x0b, 0x8b, 0x49, 0xc9, 0x3a, 0xba, 0x77, 0xf5,0x1b, 0x9b, 0x57, 0xd7, + 0x23, 0xa2, 0x5d, 0xdd, 0x03, 0x83, 0x41, 0xc1, 0x32, 0xb2, 0x6b, 0xea,0x13, 0x93, 0x4f, 0xcf, + 0x2f, 0xae, 0x67, 0xe6, 0x0f, 0x8f, 0x4d, 0xcd, 0x3e, 0xbe, 0xff, 0xfd,0x1f, 0x9f, 0x5b, 0xdb, + 0x27, 0xa6, 0x5f, 0xdf, 0x07, 0x87, 0x45, 0xc5, 0x36, 0xb6, 0x6f, 0xee,0x17, 0x97, 0x53, 0xd3, + 0x29, 0xa8, 0x61, 0xe0, 0x09, 0x89, 0x47, 0xc7, 0x38, 0xb8, 0x73, 0xf1,0x19, 0x99, 0x55, 0xd5, + 0x21, 0xa0, 0x5c, 0xdc, 0x01, 0x81, 0x3f, 0xbf, 0x30, 0xb0, 0x69, 0xe8,0x11, 0x91, 0x4e, 0xce, + 0x2d, 0xac, 0x65, 0xe4, 0x0d, 0x8d, 0x4b, 0xcb, 0x3c, 0xbc, 0x7b, 0xf9,0x1d, 0x9d, 0x59, 0xd9, + 0x25, 0xa4, 0x5e, 0xde, 0x05, 0x85, 0x43, 0xc3, 0x34, 0xb4, 0x6d, 0xec,0x15, 0x95, 0x51, 0xd1 }; -unsigned char ulaw_alaw[] = { - 0x00fc, 0x00fc, 0x00fc, 0x00fc, 0x00fc, 0x00fc, 0x00fc, 0x00fc, - 0x00fc, 0x00fc, 0x00fc, 0x00fc, 0x00fc, 0x00fc, 0x00fc, 0x00fc, - 0x00fc, 0x00fc, 0x00fc, 0x00fc, 0x00fc, 0x00fc, 0x00fc, 0x00fc, - 0x00fc, 0x00fc, 0x00fc, 0x00fc, 0x00fc, 0x00fc, 0x00fc, 0x00ac, - 0x0050, 0x00d0, 0x0010, 0x0090, 0x0070, 0x00f0, 0x0030, 0x00b0, - 0x0040, 0x00c0, 0x0000, 0x0080, 0x0060, 0x00e0, 0x0020, 0x00a0, - 0x00d8, 0x0018, 0x0098, 0x0078, 0x00f8, 0x0038, 0x00b8, 0x0048, - 0x00c8, 0x0008, 0x0088, 0x0068, 0x00e8, 0x0028, 0x00a8, 0x00d6, - 0x0096, 0x0076, 0x00f6, 0x0036, 0x00b6, 0x0046, 0x00c6, 0x0006, - 0x0086, 0x0066, 0x00e6, 0x0026, 0x00a6, 0x00de, 0x009e, 0x00fe, - 0x00fe, 0x00be, 0x00be, 0x00ce, 0x00ce, 0x008e, 0x008e, 0x00ee, - 0x00ee, 0x00d2, 0x00d2, 0x00f2, 0x00f2, 0x00c2, 0x00c2, 0x00e2, - 0x00e2, 0x00e2, 0x00da, 0x00da, 0x00da, 0x00da, 0x00fa, 0x00fa, - 0x00fa, 0x00fa, 0x00ca, 0x00ca, 0x00ca, 0x00ca, 0x00ea, 0x00ea, - 0x00ea, 0x00ea, 0x00ea, 0x00ea, 0x00eb, 0x00eb, 0x00eb, 0x00eb, - 0x00eb, 0x00eb, 0x00eb, 0x00eb, 0x00eb, 0x00eb, 0x00eb, 0x00eb, - 0x00fd, 0x00fd, 0x00fd, 0x00fd, 0x00fd, 0x00fd, 0x00fd, 0x00fd, - 0x00fd, 0x00fd, 0x00fd, 0x00fd, 0x00fd, 0x00fd, 0x00fd, 0x00fd, - 0x00fd, 0x00fd, 0x00fd, 0x00fd, 0x00fd, 0x00fd, 0x00fd, 0x00fd, - 0x00fd, 0x00fd, 0x00fd, 0x00fd, 0x00fd, 0x00fd, 0x00fd, 0x00fd, - 0x00d1, 0x0011, 0x0091, 0x0071, 0x00f1, 0x0031, 0x00b1, 0x0041, - 0x00c1, 0x0001, 0x0081, 0x0061, 0x00e1, 0x0021, 0x00a1, 0x0059, - 0x00d9, 0x0019, 0x0099, 0x0079, 0x00f9, 0x0039, 0x00b9, 0x0049, - 0x00c9, 0x0009, 0x0089, 0x0069, 0x00e9, 0x0029, 0x00a9, 0x0057, - 0x0017, 0x0097, 0x0077, 0x00f7, 0x0037, 0x00b7, 0x0047, 0x00c7, - 0x0007, 0x0087, 0x0067, 0x00e7, 0x0027, 0x00a7, 0x00df, 0x009f, - 0x009f, 0x00ff, 0x00ff, 0x00bf, 0x00bf, 0x00cf, 0x00cf, 0x008f, - 0x008f, 0x00ef, 0x00ef, 0x00af, 0x00af, 0x00d3, 0x00d3, 0x00f3, - 0x00f3, 0x00f3, 0x00c3, 0x00c3, 0x00c3, 0x00c3, 0x00e3, 0x00e3, - 0x00e3, 0x00e3, 0x00db, 0x00db, 0x00db, 0x00db, 0x00fb, 0x00fb, - 0x00fb, 0x00fb, 0x00fb, 0x00fb, 0x00cb, 0x00cb, 0x00cb, 0x00cb, - 0x00cb, 0x00cb, 0x00cb, 0x00cb, 0x00eb, 0x00eb, 0x00eb, 0x00eb + +/*---------------------------------------------------------------------------* + * mu-law to line format conversion +*---------------------------------------------------------------------------*/ +static unsigned char ulaw_raw[256] = { + 0x54, 0xd4, 0x14, 0x94, 0x74, 0xf4, 0x34, 0xb4, 0x44, 0xc4, 0x04, 0x84,0x64, 0xe4, 0x24, 0xa4, + 0x5c, 0xdc, 0x1c, 0x9c, 0x7c, 0xfc, 0x3c, 0xbc, 0x4c, 0xcc, 0x0c, 0x8c,0x6c, 0xec, 0x2c, 0xac, + 0xd0, 0x10, 0x90, 0x70, 0xf0, 0x30, 0xb0, 0x40, 0xc0, 0x00, 0x80, 0x60,0xe0, 0x20, 0xa0, 0x58, + 0xd8, 0x18, 0x98, 0x78, 0xf8, 0x38, 0xb8, 0x48, 0xc8, 0x08, 0x88, 0x68,0xe8, 0x28, 0xa8, 0xd6, + 0x16, 0x96, 0x76, 0xf6, 0x36, 0xb6, 0x46, 0xc6, 0x06, 0x86, 0x66, 0xe6,0x26, 0xa6, 0xde, 0x9e, + 0x7e, 0xfe, 0x3e, 0xbe, 0x4e, 0xce, 0x0e, 0x8e, 0x6e, 0xee, 0x2e, 0xae,0xd2, 0x92, 0xf2, 0xb2, + 0xc2, 0x02, 0x82, 0x62, 0xe2, 0x22, 0xa2, 0x5a, 0xda, 0x1a, 0x9a, 0x7a,0xfa, 0x3a, 0xba, 0x4a, + 0x4a, 0xca, 0xca, 0x0a, 0x0a, 0x8a, 0x8a, 0x6a, 0x6a, 0xea, 0xea, 0x2a,0x2a, 0xaa, 0xab, 0xab, + 0x55, 0xd5, 0x15, 0x95, 0x75, 0xf5, 0x35, 0xb5, 0x45, 0xc5, 0x05, 0x85,0x65, 0xe5, 0x25, 0xa5, + 0x5d, 0xdd, 0x1d, 0x9d, 0x7d, 0xfd, 0x3d, 0xbd, 0x4d, 0xcd, 0x0d, 0x8d,0x6d, 0xed, 0x2d, 0xad, + 0x51, 0xd1, 0x11, 0x91, 0x71, 0xf1, 0x31, 0xb1, 0x41, 0xc1, 0x01, 0x81,0x61, 0xe1, 0x21, 0xa1, + 0xd9, 0x19, 0x99, 0x79, 0xf9, 0x39, 0xb9, 0x49, 0xc9, 0x09, 0x89, 0x69,0xe9, 0x29, 0xa9, 0x57, + 0x17, 0x97, 0x77, 0xf7, 0x37, 0xb7, 0x47, 0xc7, 0x07, 0x87, 0x67, 0xe7,0x27, 0xa7, 0x5f, 0x1f, + 0x7f, 0xff, 0x3f, 0xbf, 0x4f, 0xcf, 0x0f, 0x8f, 0x6f, 0xef, 0x2f, 0xaf,0x53, 0x13, 0x73, 0x33, + 0x43, 0xc3, 0x03, 0x83, 0x63, 0xe3, 0x23, 0xa3, 0x5b, 0xdb, 0x1b, 0x9b,0x7b, 0xfb, 0x3b, 0xbb, + 0xbb, 0x4b, 0x4b, 0xcb, 0xcb, 0x0b, 0x0b, 0x8b, 0x8b, 0x6b, 0x6b, 0xeb,0xeb, 0x2b, 0x2b, 0xab }; /* EOF */ diff --git a/usr.sbin/i4b/alawulaw/ulaw2alaw.1 b/usr.sbin/i4b/alawulaw/ulaw2alaw.1 index 4c43c15..358e73b 100644 --- a/usr.sbin/i4b/alawulaw/ulaw2alaw.1 +++ b/usr.sbin/i4b/alawulaw/ulaw2alaw.1 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1998, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: ulaw2alaw.1,v 1.3 1998/12/05 18:02:37 hm Exp $ +.\" $Id: ulaw2alaw.1,v 1.4 1999/02/14 09:44:55 hm Exp $ .\" -.\" last edit-date: [Sat Dec 5 17:58:07 1998] +.\" last edit-date: [Sun Feb 14 10:01:51 1999] .\" .\" -hm writing manual pages .\" diff --git a/usr.sbin/i4b/isdnd/alias.c b/usr.sbin/i4b/isdnd/alias.c index b802776..cf5089e 100644 --- a/usr.sbin/i4b/isdnd/alias.c +++ b/usr.sbin/i4b/isdnd/alias.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,9 +30,9 @@ * NOTE: this has to stay in sync with isdntel/alias.c to be able * to share a common aliasfile! * - * $Id: alias.c,v 1.5 1998/12/05 18:03:03 hm Exp $ + * $Id: alias.c,v 1.6 1999/02/14 09:44:55 hm Exp $ * - * last edit-date: [Sat Dec 5 18:05:40 1998] + * last edit-date: [Sun Feb 14 10:10:03 1999] * *----------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdnd/config.h b/usr.sbin/i4b/isdnd/config.h index 22c947a..1adc03c 100644 --- a/usr.sbin/i4b/isdnd/config.h +++ b/usr.sbin/i4b/isdnd/config.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * i4b daemon - compile time configuration header file * --------------------------------------------------- * - * $Id: config.h,v 1.6 1998/12/05 18:03:05 hm Exp $ + * $Id: config.h,v 1.7 1999/02/14 09:44:55 hm Exp $ * - * last edit-date: [Sat Dec 5 18:05:56 1998] + * last edit-date: [Sun Feb 14 10:10:10 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdnd/controller.c b/usr.sbin/i4b/isdnd/controller.c index b3cfcf9..d34c067 100644 --- a/usr.sbin/i4b/isdnd/controller.c +++ b/usr.sbin/i4b/isdnd/controller.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * i4b daemon - controller state support routines * ---------------------------------------------- * - * $Id: controller.c,v 1.10 1998/12/05 18:03:06 hm Exp $ + * $Id: controller.c,v 1.12 1999/02/15 16:48:04 hm Exp $ * - * last edit-date: [Sat Dec 5 18:06:10 1998] + * last edit-date: [Mon Feb 15 16:37:55 1999] * *---------------------------------------------------------------------------*/ @@ -61,10 +61,10 @@ init_controller_state(int controller, int ctrl_type, int card_type, int tei) isdn_ctrl_tab[controller].stateb2 = CHAN_IDLE; isdn_ctrl_tab[controller].freechans = MAX_CHANCTRL; isdn_ctrl_tab[controller].tei = tei; - log(LL_DMN, "init_controller_state: controller %d is %s", + DBGL(DL_RCCF, (log(LL_DBG, "init_controller_state: controller %d is %s", controller, name_of_controller(isdn_ctrl_tab[controller].ctrl_type, - isdn_ctrl_tab[controller].card_type)); + isdn_ctrl_tab[controller].card_type)))); } else { diff --git a/usr.sbin/i4b/isdnd/curses.c b/usr.sbin/i4b/isdnd/curses.c index b505382..ad7bb95 100644 --- a/usr.sbin/i4b/isdnd/curses.c +++ b/usr.sbin/i4b/isdnd/curses.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * i4b daemon - curses fullscreen output * ------------------------------------- * - * $Id: curses.c,v 1.27 1998/12/05 18:03:08 hm Exp $ + * $Id: curses.c,v 1.28 1999/02/14 09:44:56 hm Exp $ * - * last edit-date: [Sat Dec 5 18:06:24 1998] + * last edit-date: [Sun Feb 14 10:10:24 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdnd/dial.c b/usr.sbin/i4b/isdnd/dial.c index 4308f98..747a8c7 100644 --- a/usr.sbin/i4b/isdnd/dial.c +++ b/usr.sbin/i4b/isdnd/dial.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * i4b daemon - dial handling routines * ----------------------------------- * - * $Id: dial.c,v 1.6 1998/12/05 18:03:09 hm Exp $ + * $Id: dial.c,v 1.7 1999/02/14 09:44:56 hm Exp $ * - * last edit-date: [Sat Dec 5 18:06:36 1998] + * last edit-date: [Sun Feb 14 10:10:30 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdnd/exec.c b/usr.sbin/i4b/isdnd/exec.c index 1ed81a1..2d95e21 100644 --- a/usr.sbin/i4b/isdnd/exec.c +++ b/usr.sbin/i4b/isdnd/exec.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * exec.h - supplemental program/script execution * ---------------------------------------------- * - * $Id: exec.c,v 1.10 1998/12/05 18:03:11 hm Exp $ + * $Id: exec.c,v 1.11 1999/02/14 09:44:56 hm Exp $ * - * last edit-date: [Sat Dec 5 18:06:49 1998] + * last edit-date: [Sun Feb 14 10:10:35 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdnd/fsm.c b/usr.sbin/i4b/isdnd/fsm.c index 13d5778..463f41a 100644 --- a/usr.sbin/i4b/isdnd/fsm.c +++ b/usr.sbin/i4b/isdnd/fsm.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * FSM for isdnd * ------------- * - * $Id: fsm.c,v 1.15 1998/12/05 18:03:12 hm Exp $ + * $Id: fsm.c,v 1.16 1999/02/14 09:44:56 hm Exp $ * - * last edit-date: [Sat Dec 5 18:07:31 1998] + * last edit-date: [Sun Feb 14 10:10:41 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdnd/isdnd.8 b/usr.sbin/i4b/isdnd/isdnd.8 index 9913487..950614c 100644 --- a/usr.sbin/i4b/isdnd/isdnd.8 +++ b/usr.sbin/i4b/isdnd/isdnd.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,18 +22,17 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: isdnd.8,v 1.20 1998/12/18 09:47:09 hm Exp $ +.\" $Id: isdnd.8,v 1.24 1999/02/23 16:25:49 hm Exp $ .\" -.\" last edit-date: [Sat Dec 12 21:13:59 1998] +.\" last edit-date: [Tue Feb 23 16:46:26 1999] .\" -.Dd November 3, 1998 +.Dd February 23, 1999 .Dt isdnd 8 .Sh NAME .Nm isdnd .Nd isdn4bsd ISDN connection management daemon .Sh SYNOPSIS .Nm isdnd -.Op Fl b .Op Fl c Ar configfile .Op Fl d Ar debuglevel .Op Fl f @@ -53,9 +52,6 @@ and disconnection of ISDN devices supported by the package. .Pp The options are as follows: .Bl -tag -width Ds -.It Fl b -Bell: in full-screen mode, ring the bell when connecting -or disconnecting a call. .It Fl c Use .Ar configfile @@ -89,6 +85,8 @@ process handling. isdn4bsd kernel i/o calls. .It Ar 0x100 controller and channel busy/free messages. +.It Ar 0x200 +isdnd.rc configuration file processing. .El .Pp The value can be specified in any number base supported by the @@ -277,11 +275,11 @@ to the daemon. .Pp The call is terminated by either the local site timing out or the remote side hanging up the connection or the local side actively sending a -.Em DISCONNECT_REQ +.Em I4B_DISCONNECT_REQ ioctl message, both events are signaled to the .Nm by the kernel sending the -.Em DISCONNECT_IND +.Em I4B_DISCONNECT_IND message and the CDID corresponding to the call is no longer valid. .Pp .Ss INCOMING CALLS @@ -294,23 +292,23 @@ message to the daemon. With the information contained in this message, the .Nm searches the entry section of its configuration database and if a match is -found, it accepts or rejects the call or, of no match is found, it ignores the +found, it accepts or rejects the call or, if no match is found, it ignores the call - all by issuing a .Em I4B_CONNECT_RESP ioctl message with the appropriate parameters to the kernel. .Pp -In case the daemon decided to accept the message, the kernel signal the then -active connection by sending a +In case the daemon decided to accept the call, the kernel signals this +by sending a .Em MSG_CONNECT_ACTIVE_IND message to the daemon. .Pp The call is terminated by either the local site timing out or the remote side hanging up the connection or the local side actively sending a -.Em DISCONNECT_REQ +.Em I4B_DISCONNECT_REQ ioctl message, both events are signaled to the .Nm by the kernel sending the -.Em DISCONNECT_IND +.Em I4B_DISCONNECT_IND message and the CDID corresponding to the call is no longer valid. .Pp diff --git a/usr.sbin/i4b/isdnd/isdnd.acct.5 b/usr.sbin/i4b/isdnd/isdnd.acct.5 index 45c0883..34e8cff 100644 --- a/usr.sbin/i4b/isdnd/isdnd.acct.5 +++ b/usr.sbin/i4b/isdnd/isdnd.acct.5 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: isdnd.acct.5,v 1.1 1998/12/27 21:47:01 phk Exp $ +.\" $Id: isdnd.acct.5,v 1.8 1999/02/15 16:48:04 hm Exp $ .\" -.\" last edit-date: [Sat Dec 5 18:09:33 1998] +.\" last edit-date: [Mon Feb 15 16:54:23 1999] .\" .Dd September 11, 1998 .Dt isdnd.acct 5 @@ -58,7 +58,7 @@ The general format of an accounting line is as follows: .Pp .Em FROM is the time the connection was established in the format -.Dl Day:Month:Year Hour:Minutes:seconds +.Dl Day.Month.Year Hour:Minutes:seconds .Pp .Em UNTIL is the time the connection was closed. The format is the same as diff --git a/usr.sbin/i4b/isdnd/isdnd.h b/usr.sbin/i4b/isdnd/isdnd.h index 009a2dd..e4033ff 100644 --- a/usr.sbin/i4b/isdnd/isdnd.h +++ b/usr.sbin/i4b/isdnd/isdnd.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * i4b daemon - main header file * ----------------------------- * - * $Id: isdnd.h,v 1.56 1998/12/16 13:39:46 hm Exp $ + * $Id: isdnd.h,v 1.59 1999/02/15 15:02:58 hm Exp $ * - * last edit-date: [Mon Dec 14 10:06:39 1998] + * last edit-date: [Mon Feb 15 15:42:37 1999] * *---------------------------------------------------------------------------*/ @@ -94,6 +94,7 @@ #define DL_PROC 0x0040 /* messages related to process handling */ #define DL_DRVR 0x0080 /* messages related to kernel i4b msg i/o*/ #define DL_CNST 0x0100 /* messages related to controller state */ +#define DL_RCCF 0x0200 /* messages related to isdnd.rc at boot */ #ifdef DEBUG #define DBGL(cond, dolog) if(cond & debug_flags) dolog @@ -145,10 +146,8 @@ /* struct for rates - each day has one or more */ struct rates { - int start_hr; /* hour at which this rate starts, e.g. 12 */ - int start_min; /* minute of start ... */ - int end_hr; /* hour at which this rate ends, e.g. 19 */ - int end_min; /* minute of end ... */ + int start_time; /* hour and min at which this rate starts, e.g. 12:20 12*60+20*/ + int end_time; /* hour and min at which this rate ends, e.g. 19:10 19*60+10*/ int rate; /* how long can I telephone at this price, seconds */ struct rates *next; }; @@ -266,6 +265,7 @@ typedef struct cfg_entry { int idle_time_in; /* max idle time incoming calls */ int idle_time_out; /* max idle time outgoing calls */ + msg_shorthold_algorithm_t shorthold_algorithm; /* shorthold algorithm */ int unitlength; /* length of a charging unit */ #define UNITLENGTH_DEFAULT 60 /* last resort unit length */ diff --git a/usr.sbin/i4b/isdnd/isdnd.rates.5 b/usr.sbin/i4b/isdnd/isdnd.rates.5 index b25a611..4a8cc94 100644 --- a/usr.sbin/i4b/isdnd/isdnd.rates.5 +++ b/usr.sbin/i4b/isdnd/isdnd.rates.5 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: isdnd.rates.5,v 1.1 1998/12/27 21:47:01 phk Exp $ +.\" $Id: isdnd.rates.5,v 1.7 1999/02/14 09:44:56 hm Exp $ .\" -.\" last edit-date: [Sat Dec 5 18:09:57 1998] +.\" last edit-date: [Sun Feb 14 10:11:05 1999] .\" .Dd September 11, 1998 .Dt isdnd.rates 5 diff --git a/usr.sbin/i4b/isdnd/isdnd.rc.5 b/usr.sbin/i4b/isdnd/isdnd.rc.5 index 676682e..4e21b46 100644 --- a/usr.sbin/i4b/isdnd/isdnd.rc.5 +++ b/usr.sbin/i4b/isdnd/isdnd.rc.5 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,11 +22,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: isdnd.rc.5,v 1.1 1998/12/27 21:47:01 phk Exp $ +.\" $Id: isdnd.rc.5,v 1.31 1999/02/25 19:16:53 hm Exp $ .\" -.\" last edit-date: [Sat Dec 5 18:10:08 1998] +.\" last edit-date: [Thu Feb 25 20:15:38 1999] .\" -.Dd October 27, 1998 +.Dd February, 23, 1999 .Dt isdnd.rc 5 .Sh NAME .Nm isdnd.rc @@ -108,6 +108,11 @@ utility when alias processing is enabled via the .Em aliasing keyword. (optional) +.It Li beepconnect +In fullscreen mode, if this parameter is set to +.Em on , +ring the bell when connecting or disconnecting a call. + .It Li isdntime If this parameter is set to .Em on , @@ -345,6 +350,19 @@ This keyword is optional and is set to 60 seconds by default. A (safety) time in seconds which specifies the time to hangup before an expected next charging unit will occur. (optional) +.It Li idle-algorithm-outgoing +The algorithm used to determine when to hang up an outgoing call when the +line becomes idle. The current algorithms are: + +.Pp +.Bl -tag -width calledback -compact -offset +.It Ar fix-unit-size +idle algorithm which assumes fixed sized changing units during the whole call. +.It Ar var-unit-size +idle algorithm which assumes that the charging is time based after the first +units time has expired. +.El + .It Li idletime-outgoing The time in seconds an outgoing connection must be idle before hanging up. (optional) @@ -533,7 +551,16 @@ address negotiation is complete (i.e.: the connection is useable). expects to find the program below the path .Pa /etc/isdn which is prepended to the string specified as a parameter to this keyword. -(optional) +The programs specified by connect and disconnect will get the following +command line arguments: -d (device) -f (flag) [ -a (addr) ] where +.Em device +is the name of device, e.g. "isp0", +.Em flag +will be "up" if connection just got up, or "down" if interface changed to down +state and +.Em addr +the address that got assigned to the interface as a dotted-quad ip address +(optional, only if it can be figured out by isdnd). (optional) .It Li disconnectprog specifies a program run everytime after a connection was shut down. @@ -565,11 +592,15 @@ is used as a last resort and is therefore set much higher than a charging unit time: typical values are one to five minutes. .It Li outgoing calls -Outgoing call disconnect time can be setup in one of two ways: +Outgoing call disconnect time can be setup in one of three ways: .Bl -tag -width shorthold mode -compact .It Li simple mode -For simple mode, the selected +For simple mode, the +.Em idle-algorithm-outgoing +must be +.Em fix-unit-size +and the selected .Em unitlength must be 0 (zero) and .Em idletime-outgoing @@ -582,8 +613,12 @@ the call is closed. .Pp Typical values in simple mode are 10 to 30 seconds. -.It Li shorthold mode -For shorthold mode, the selected +.It Li shorthold mode for fixed unit charging +For shorthold mode, the +.Em idle-algorithm-outgoing + must be +.Em fix-unit-size + and the selected .Em unitlength and .Em idletime-outgoing @@ -615,6 +650,52 @@ must (!) be greater than the sum of and .Em earlyhangup ! +.It Li shorthold mode for variable unit charging +For shorthold mode, the +.Em idle-algorithm-outgoing +must be +.Em var-unit-size +and the selected +.Em unitlength +and +.Em idletime-outgoing +must be greater than 0 (zero); +.Pp + +This shorthold mode is suitable when your calls are billed on +the elapse time of the call plus a fixed connection charge. +For example British Telecom bill this way. +.Pp + +Each call is divided into two periods, the first is the +.Em unchecked +period and the second is the +.Em checked +. The +.Em checked +period starts 1 second before the first units time expires. +.Pp +During the +.Em checked +period if there is no traffic for +.Em idle-time +seconds the call is disconnected. +.Pp + +.Bd -literal + +|<---unchecked------------------>|<------checked------> ++------------------+-------------+ +| |<-idle-time->| +|<--------------unitlength------->| + +.Ed + +Experience shows that useful values for idle-time are from 15 to 30 seconds. +.Pp +If idle-time is too short an application that is not yet finished with the +network will cause a new call to be placed. +.Pp .El .El @@ -638,3 +719,5 @@ The .Xr isdnd 8 daemon and this manual page were written by Hellmuth Michaelis. He can be reached at hm@kts.org. +.Pp +Additions to this manual page by Barry Scott (barry@scottb.demon.co.uk). diff --git a/usr.sbin/i4b/isdnd/log.c b/usr.sbin/i4b/isdnd/log.c index 4c1ffb6..cdd4734 100644 --- a/usr.sbin/i4b/isdnd/log.c +++ b/usr.sbin/i4b/isdnd/log.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * i4b daemon - logging routines * ----------------------------- * - * $Id: log.c,v 1.14 1998/12/05 18:03:24 hm Exp $ + * $Id: log.c,v 1.15 1999/02/14 09:44:56 hm Exp $ * - * last edit-date: [Sat Dec 5 18:10:22 1998] + * last edit-date: [Sun Feb 14 10:11:18 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdnd/main.c b/usr.sbin/i4b/isdnd/main.c index 9d16717..eb6ae5c 100644 --- a/usr.sbin/i4b/isdnd/main.c +++ b/usr.sbin/i4b/isdnd/main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * i4b daemon - main program entry * ------------------------------- * - * $Id: main.c,v 1.29 1998/12/05 18:03:26 hm Exp $ + * $Id: main.c,v 1.34 1999/02/23 16:25:49 hm Exp $ * - * last edit-date: [Sat Dec 5 18:10:38 1998] + * last edit-date: [Tue Feb 23 16:47:33 1999] * *---------------------------------------------------------------------------*/ @@ -74,19 +74,18 @@ usage(void) fprintf(stderr, "\n"); fprintf(stderr, "isdnd - i4b ISDN manager daemon, version %02d.%02d.%d, %s %s\n", VERSION, REL, STEP, __DATE__, __TIME__); #ifdef DEBUG - fprintf(stderr, " usage: isdnd [-b] [-c file] [-d level] [-F]\n"); + fprintf(stderr, " usage: isdnd [-c file] [-d level] [-F] [-f [-r dev] [-t termtype]]\n"); #else - fprintf(stderr, " usage: isdnd [-b] [-c file] [-F]\n"); + fprintf(stderr, " usage: isdnd [-c file] [-F] [-f [-r dev] [-t termtype]]\n"); #endif - fprintf(stderr, " [-f [-r dev] [-t termtype]] [-u time]\n"); - fprintf(stderr, " [-l] [-L file] [-s facility] [-m]\n"); - fprintf(stderr, " -b audible bell in fullscreen mode at connect/disconnect\n"); + fprintf(stderr, " [-l] [-L file] [-m] [-s facility] [-u time]\n"); fprintf(stderr, " -c <filename> configuration file name (def: %s)\n", CONFIG_FILE_DEF); #ifdef DEBUG fprintf(stderr, " -d <level> set debug flag bits:\n"); fprintf(stderr, " general = 0x%04x, rates = 0x%04x, timing = 0x%04x\n", DL_MSG, DL_RATES, DL_TIME); fprintf(stderr, " state = 0x%04x, retry = 0x%04x, dial = 0x%04x\n", DL_STATE, DL_RCVRY, DL_DIAL); - fprintf(stderr, " process = 0x%04x, kernio = 0x%04x ctrlstat = 0x%04x\n", DL_PROC, DL_DRVR, DL_CNST); + fprintf(stderr, " process = 0x%04x, kernio = 0x%04x ctrlstat = 0x%04x\n", DL_PROC, DL_DRVR, DL_CNST); + fprintf(stderr, " rc-file = 0x%04x\n", DL_RCCF); fprintf(stderr, " -dn no debug output on fullscreen display\n"); #endif fprintf(stderr, " -f fullscreen status display\n"); @@ -319,7 +318,7 @@ main(int argc, char **argv) if(i == GOOD) { got_rate = 1; /* flag, ratesfile read and ok */ - DBGL(DL_MSG, (log(LL_DBG, "ratesfile %s read successfully", ratesfile))); + DBGL(DL_RCCF, (log(LL_DBG, "ratesfile %s read successfully", ratesfile))); } else { @@ -442,7 +441,7 @@ mloop( /* go into loop */ - log(LL_DMN, "daemon started (pid = %d)", getpid()); + log(LL_DMN, "i4b isdn daemon started (pid = %d)", getpid()); for(;;) { diff --git a/usr.sbin/i4b/isdnd/monitor.c b/usr.sbin/i4b/isdnd/monitor.c index 884df13..53beb43 100644 --- a/usr.sbin/i4b/isdnd/monitor.c +++ b/usr.sbin/i4b/isdnd/monitor.c @@ -33,9 +33,9 @@ * i4b daemon - network monitor server module * ------------------------------------------ * - * $Id: monitor.c,v 1.6 1998/08/10 13:55:24 hm Exp $ + * $Id: monitor.c,v 1.8 1999/02/15 16:48:04 hm Exp $ * - * last edit-date: [Fri Jul 17 18:07:00 1998] + * last edit-date: [Mon Feb 15 16:42:18 1999] * * -mh created * @@ -221,7 +221,7 @@ int monitor_start_rights(const char *clientspec) if (r.local) local_rights = i; - log(LL_DBG, "system: monitor = %s", clientspec); + DBGL(DL_RCCF, (log(LL_DBG, "system: monitor = %s", clientspec))); return I4BMAR_OK; } @@ -235,7 +235,7 @@ void monitor_add_rights(int rights_mask) VARA_AT(rights, cur_add_entry).rights |= rights_mask; - log(LL_DBG, "system: monitor-access = 0x%x", rights_mask); + DBGL(DL_RCCF, (log(LL_DBG, "system: monitor-access = 0x%x", rights_mask))); } /* diff --git a/usr.sbin/i4b/isdnd/msghdl.c b/usr.sbin/i4b/isdnd/msghdl.c index 61ac0ed..b24ac24 100644 --- a/usr.sbin/i4b/isdnd/msghdl.c +++ b/usr.sbin/i4b/isdnd/msghdl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * i4b daemon - message from kernel handling routines * -------------------------------------------------- * - * $Id: msghdl.c,v 1.54 1998/12/19 09:03:16 hm Exp $ + * $Id: msghdl.c,v 1.57 1999/02/25 12:45:41 hm Exp $ * - * last edit-date: [Sat Dec 19 09:57:16 1998] + * last edit-date: [Thu Feb 25 13:43:46 1999] * *---------------------------------------------------------------------------*/ @@ -502,7 +502,7 @@ msg_ifstatechg_ind(msg_ifstatechg_ind_t *mp) } device = bdrivername(cep->usrdevicename); - log(LL_DBG, "%s%d: switched to state %d\n", device, cep->usrdeviceunit, mp->state); + log(LL_DBG, "%s%d: switched to state %d", device, cep->usrdeviceunit, mp->state); } /*---------------------------------------------------------------------------* @@ -854,9 +854,11 @@ sendm_connect_req(cfg_entry_t *cep) mcr.driver = cep->usrdevicename; mcr.driver_unit = cep->usrdeviceunit; - mcr.unitlen_time = cep->unitlength; - mcr.idle_time = cep->idle_time_out; - mcr.earlyhup_time = cep->earlyhangup; + /* setup the shorthold data */ + mcr.shorthold_data.shorthold_algorithm = cep->shorthold_algorithm; + mcr.shorthold_data.unitlen_time = cep->unitlength; + mcr.shorthold_data.idle_time = cep->idle_time_out; + mcr.shorthold_data.earlyhup_time = cep->earlyhangup; if(cep->unitlengthsrc == ULSRC_DYN) mcr.unitlen_method = ULEN_METHOD_DYNAMIC; diff --git a/usr.sbin/i4b/isdnd/pathnames.h b/usr.sbin/i4b/isdnd/pathnames.h index 75afec9..f986116 100644 --- a/usr.sbin/i4b/isdnd/pathnames.h +++ b/usr.sbin/i4b/isdnd/pathnames.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * i4b daemon - location of files * ------------------------------ * - * $Id: pathnames.h,v 1.5 1998/12/05 18:03:30 hm Exp $ + * $Id: pathnames.h,v 1.7 1999/02/14 19:51:01 hm Exp $ * - * last edit-date: [Sat Dec 5 18:11:17 1998] + * last edit-date: [Sun Feb 14 10:11:43 1999] * *---------------------------------------------------------------------------*/ @@ -45,7 +45,11 @@ #define LIBDIR "/usr/local/lib/isdn" #define LOG_FILE_DEF "/var/log/isdnd.log" +#ifdef __bsdi__ #define ACCT_FILE_DEF "/var/log/isdnd.acct" +#else +#define ACCT_FILE_DEF "/var/account/isdnd.acct" +#endif #define PIDFILE "/var/run/isdnd.pid" diff --git a/usr.sbin/i4b/isdnd/pcause.c b/usr.sbin/i4b/isdnd/pcause.c index c782f2c..31f928d 100644 --- a/usr.sbin/i4b/isdnd/pcause.c +++ b/usr.sbin/i4b/isdnd/pcause.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * printing cause values * --------------------- * - * $Id: pcause.c,v 1.9 1998/12/05 18:03:31 hm Exp $ + * $Id: pcause.c,v 1.10 1999/02/14 09:44:56 hm Exp $ * - * last edit-date: [Sat Dec 5 18:11:31 1998] + * last edit-date: [Sun Feb 14 10:11:49 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdnd/process.c b/usr.sbin/i4b/isdnd/process.c index 47c9eda..7d8c2c4 100644 --- a/usr.sbin/i4b/isdnd/process.c +++ b/usr.sbin/i4b/isdnd/process.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * i4b daemon - process handling routines * -------------------------------------- * - * $Id: process.c,v 1.6 1998/12/05 18:03:33 hm Exp $ + * $Id: process.c,v 1.7 1999/02/14 09:44:56 hm Exp $ * - * last edit-date: [Sat Dec 5 18:11:42 1998] + * last edit-date: [Sun Feb 14 10:11:54 1999] * * -hm debugging processhandling * diff --git a/usr.sbin/i4b/isdnd/rates.c b/usr.sbin/i4b/isdnd/rates.c index c1b1163..5b7d8f8 100644 --- a/usr.sbin/i4b/isdnd/rates.c +++ b/usr.sbin/i4b/isdnd/rates.c @@ -1,7 +1,7 @@ /* * Copyright (c) 1997 Gary Jennejohn. All rights reserved. * - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -35,14 +35,16 @@ * i4b daemon - charging rates description file handling * ----------------------------------------------------- * - * $Id: rates.c,v 1.7 1998/12/05 18:03:34 hm Exp $ + * $Id: rates.c,v 1.9 1999/02/15 09:55:47 hm Exp $ * - * last edit-date: [Sat Dec 5 18:11:55 1998] + * last edit-date: [Sun Feb 14 10:12:01 1999] * *---------------------------------------------------------------------------*/ static char error[256]; +static int getrate(int rate_type); + #ifdef PARSE_DEBUG_MAIN #include <stdio.h> @@ -51,14 +53,29 @@ static char error[256]; #define ERROR (-1) -int main() +extern int got_rate; + +int main( int argc, char **argv ) { int ret; ret = readrates("/etc/isdn/isdnd.rates"); if(ret == ERROR) fprintf(stderr, "readrates returns [%d], [%s]\n", ret, error); else + { + int type = 0; + + got_rate = 1; + fprintf(stderr, "readrates returns [%d]\n", ret); + + for( type=0; type<4; type++ ) + { + int unit = getrate( type ); + fprintf(stderr, "getrate(%d) => %d\n", type, unit ); + } + } + return(ret); } @@ -66,8 +83,6 @@ int main() #include "isdnd.h" -static int getrate(cfg_entry_t *cep); - /*---------------------------------------------------------------------------* * parse rates file *---------------------------------------------------------------------------*/ @@ -171,6 +186,9 @@ readrates(char *filename) while(*bp && isdigit(*bp)) { + int hour = 0; + int min = 0; + if(first) { first = 0; @@ -193,7 +211,7 @@ readrates(char *filename) if(isdigit(*bp) && isdigit(*(bp+1))) { - rt->start_hr = atoi(bp); + hour = atoi(bp); bp += 2; } else @@ -218,7 +236,7 @@ readrates(char *filename) if(isdigit(*bp) && isdigit(*(bp+1))) { - rt->start_min = atoi(bp); + min = atoi(bp); bp += 2; } else @@ -227,6 +245,8 @@ readrates(char *filename) goto rate_error; } + rt->start_time = hour*60 + min; + /* minus */ if(*bp == '-') @@ -243,7 +263,7 @@ readrates(char *filename) if(isdigit(*bp) && isdigit(*(bp+1))) { - rt->end_hr = atoi(bp); + hour = atoi(bp); bp += 2; } else @@ -268,7 +288,7 @@ readrates(char *filename) if(isdigit(*bp) && isdigit(*(bp+1))) { - rt->end_min = atoi(bp); + min = atoi(bp); bp += 2; } else @@ -277,6 +297,17 @@ readrates(char *filename) goto rate_error; } + /* if hour is 0 assume it means midnight */ + if( hour == 0 ) + hour = 24; + rt->end_time = hour * 60 + min; + + if( rt->end_time <= rt->start_time ) + { + sprintf(error, "rates: end_time must be greater then start_time %d", line); + goto rate_error; + } + /* colon */ if(*bp == ':') @@ -322,9 +353,9 @@ readrates(char *filename) rt = rates [j][i]; for (; rt; rt = rt->next) { - log(LL_DBG, "rates: index %d day %d = %d.%d-%d.%d:%d", - j, i, rt->start_hr, rt->start_min, - rt->end_hr,rt->end_min,rt->rate); + log(LL_DBG, "rates: index %d day %d = %d.%2.2d-%d.%2.2d:%d", + j, i, rt->start_time/60, rt->start_time%60, + rt->end_time/60,rt->end_time%60,rt->rate); } } else @@ -386,7 +417,7 @@ get_current_rate(cfg_entry_t *cep, int logit) return(UNITLENGTH_DEFAULT); } - if((rt = getrate(cep)) != -1) + if((rt = getrate(cep->ratetype)) != -1) { if(logit) log(LL_CHD, "%05d %s rate %d sec/unit (rate)", @@ -402,7 +433,7 @@ get_current_rate(cfg_entry_t *cep, int logit) break; case ULSRC_DYN: /* dynamically calculated from AOC */ - if((rt = getrate(cep)) != -1) + if((rt = getrate(cep->ratetype)) != -1) { if(logit) log(LL_CHD, "%05d %s rate %d sec/unit (aocd, rate)", @@ -425,49 +456,52 @@ get_current_rate(cfg_entry_t *cep, int logit) break; } } +#endif /* PARSE_DEBUG_MAIN */ + /*---------------------------------------------------------------------------* * get the currently active rate *---------------------------------------------------------------------------*/ static int -getrate(cfg_entry_t *cep) +getrate(int rate_type ) { struct tm *ptr; time_t now; register struct rates *hd; + int time_now; if((!got_rate) || - (cep->ratetype >= NRATES) || - (cep->ratetype == INVALID_RATE)) + (rate_type >= NRATES) || + (rate_type == INVALID_RATE)) { - return(-1); + return -1; } time(&now); /* get current time */ ptr = localtime(&now); + time_now = ptr->tm_hour*60 + ptr->tm_min; + /* walk thru the rates for weekday until rate for current time found */ - for (hd = rates[cep->ratetype][ptr->tm_wday]; hd; hd = hd->next) + for (hd = rates[rate_type][ptr->tm_wday]; hd; hd = hd->next) { /* current time within window ? */ - if((hd->start_hr <= ptr->tm_hour) && - (hd->end_hr > ptr->tm_hour)) + if((time_now >= hd->start_time ) && + (time_now < hd->end_time )) { - DBGL(DL_RATES, (log(LL_DBG, "rate=%d sec/unit (day=%d, beg=%d, end=%d, current=%d)", + DBGL(DL_RATES, (log(LL_DBG, "rate=%d sec/unit (day=%d, beg=%d:%2.2d, end=%d:2.2d, current=%d:%2.2d)", hd->rate, ptr->tm_wday, - hd->start_hr, - hd->end_hr, - ptr->tm_hour))); + hd->start_time/60, hd->start_time%60, + hd->end_time/60, hd->end_time%60, + time_now/60, time_now%60))); - return (hd->rate); + return hd->rate; } } - return(-1); + return -1; } -#endif /* PARSE_DEBUG_MAIN */ - /* EOF */ diff --git a/usr.sbin/i4b/isdnd/rc_config.c b/usr.sbin/i4b/isdnd/rc_config.c index 884edfa..3fa3ef5 100644 --- a/usr.sbin/i4b/isdnd/rc_config.c +++ b/usr.sbin/i4b/isdnd/rc_config.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * i4b daemon - config file processing * ----------------------------------- * - * $Id: rc_config.c,v 1.35 1998/12/16 13:39:47 hm Exp $ + * $Id: rc_config.c,v 1.40 1999/02/23 16:25:49 hm Exp $ * - * last edit-date: [Mon Dec 14 13:41:41 1998] + * last edit-date: [Tue Feb 23 16:43:56 1999] * *---------------------------------------------------------------------------*/ @@ -207,38 +207,38 @@ cfg_setval(int keyword) { case ACCTALL: acct_all = yylval.booln; - log(LL_DBG, "system: acctall = %d", yylval.booln); + DBGL(DL_RCCF, (log(LL_DBG, "system: acctall = %d", yylval.booln))); break; case ACCTFILE: strcpy(acctfile, yylval.str); - log(LL_DBG, "system: acctfile = %s", yylval.str); + DBGL(DL_RCCF, (log(LL_DBG, "system: acctfile = %s", yylval.str))); break; case ALERT: if(yylval.num < MINALERT) { yylval.num = MINALERT; - log(LL_DBG, "entry %d: alert < %d, min = %d", entrycount, MINALERT, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: alert < %d, min = %d", entrycount, MINALERT, yylval.num))); } else if(yylval.num > MAXALERT) { yylval.num = MAXALERT; - log(LL_DBG, "entry %d: alert > %d, min = %d", entrycount, MAXALERT, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: alert > %d, min = %d", entrycount, MAXALERT, yylval.num))); } - log(LL_DBG, "entry %d: alert = %d", entrycount, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: alert = %d", entrycount, yylval.num))); cfg_entry_tab[entrycount].alert = yylval.num; break; case ALIASING: - log(LL_DBG, "system: aliasing = %d", yylval.booln); + DBGL(DL_RCCF, (log(LL_DBG, "system: aliasing = %d", yylval.booln))); aliasing = yylval.booln; break; case ALIASFNAME: strcpy(aliasfile, yylval.str); - log(LL_DBG, "system: aliasfile = %s", yylval.str); + DBGL(DL_RCCF, (log(LL_DBG, "system: aliasfile = %s", yylval.str))); break; case ANSWERPROG: @@ -248,11 +248,11 @@ cfg_setval(int keyword) do_exit(1); } strcpy(cfg_entry_tab[entrycount].answerprog, yylval.str); - log(LL_DBG, "entry %d: answerprog = %s", entrycount, yylval.str); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: answerprog = %s", entrycount, yylval.str))); break; case B1PROTOCOL: - log(LL_DBG, "entry %d: b1protocol = %s", entrycount, yylval.str); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: b1protocol = %s", entrycount, yylval.str))); if(!(strcmp(yylval.str, "raw"))) cfg_entry_tab[entrycount].b1protocol = BPROT_NONE; else if(!(strcmp(yylval.str, "hdlc"))) @@ -264,14 +264,19 @@ cfg_setval(int keyword) } break; + case BEEPCONNECT: + do_bell = yylval.booln; + DBGL(DL_RCCF, (log(LL_DBG, "system: beepconnect = %d", yylval.booln))); + break; + case CALLBACKWAIT: if(yylval.num < CALLBACKWAIT_MIN) { yylval.num = CALLBACKWAIT_MIN; - log(LL_DBG, "entry %d: callbackwait < %d, min = %d", entrycount, CALLBACKWAIT_MIN, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: callbackwait < %d, min = %d", entrycount, CALLBACKWAIT_MIN, yylval.num))); } - - log(LL_DBG, "entry %d: callbackwait = %d", entrycount, yylval.num); + + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: callbackwait = %d", entrycount, yylval.num))); cfg_entry_tab[entrycount].callbackwait = yylval.num; break; @@ -279,10 +284,10 @@ cfg_setval(int keyword) if(yylval.num < CALLEDBACKWAIT_MIN) { yylval.num = CALLEDBACKWAIT_MIN; - log(LL_DBG, "entry %d: calledbackwait < %d, min = %d", entrycount, CALLEDBACKWAIT_MIN, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: calledbackwait < %d, min = %d", entrycount, CALLEDBACKWAIT_MIN, yylval.num))); } - log(LL_DBG, "entry %d: calledbackwait = %d", entrycount, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: calledbackwait = %d", entrycount, yylval.num))); cfg_entry_tab[entrycount].calledbackwait = yylval.num; break; @@ -293,11 +298,11 @@ cfg_setval(int keyword) do_exit(1); } strcpy(cfg_entry_tab[entrycount].connectprog, yylval.str); - log(LL_DBG, "entry %d: connectprog = %s", entrycount, yylval.str); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: connectprog = %s", entrycount, yylval.str))); break; case DIALOUTTYPE: - log(LL_DBG, "entry %d: dialouttype = %s", entrycount, yylval.str); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: dialouttype = %s", entrycount, yylval.str))); if(!(strcmp(yylval.str, "normal"))) cfg_entry_tab[entrycount].dialouttype = DIALOUT_NORMAL; else if(!(strcmp(yylval.str, "calledback"))) @@ -310,17 +315,17 @@ cfg_setval(int keyword) break; case DIALRETRIES: - log(LL_DBG, "entry %d: dialretries = %d", entrycount, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: dialretries = %d", entrycount, yylval.num))); cfg_entry_tab[entrycount].dialretries = yylval.num; break; case DIALRANDINCR: - log(LL_DBG, "entry %d: dialrandincr = %d", entrycount, yylval.booln); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: dialrandincr = %d", entrycount, yylval.booln))); cfg_entry_tab[entrycount].dialrandincr = yylval.booln; break; case DIRECTION: - log(LL_DBG, "entry %d: direction = %s", entrycount, yylval.str); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: direction = %s", entrycount, yylval.str))); if(!(strcmp(yylval.str, "inout"))) cfg_entry_tab[entrycount].inout = DIR_INOUT; @@ -342,7 +347,7 @@ cfg_setval(int keyword) do_exit(1); } strcpy(cfg_entry_tab[entrycount].disconnectprog, yylval.str); - log(LL_DBG, "entry %d: disconnectprog = %s", entrycount, yylval.str); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: disconnectprog = %s", entrycount, yylval.str))); break; case DOWNTRIES: @@ -351,7 +356,7 @@ cfg_setval(int keyword) else if(yylval.num < DOWN_TRIES_MIN) yylval.num = DOWN_TRIES_MIN; - log(LL_DBG, "entry %d: downtries = %d", entrycount, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: downtries = %d", entrycount, yylval.num))); cfg_entry_tab[entrycount].downtries = yylval.num; break; @@ -361,28 +366,46 @@ cfg_setval(int keyword) else if(yylval.num < DOWN_TIME_MIN) yylval.num = DOWN_TIME_MIN; - log(LL_DBG, "entry %d: downtime = %d", entrycount, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: downtime = %d", entrycount, yylval.num))); cfg_entry_tab[entrycount].downtime = yylval.num; break; case EARLYHANGUP: - log(LL_DBG, "entry %d: earlyhangup = %d", entrycount, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: earlyhangup = %d", entrycount, yylval.num))); cfg_entry_tab[entrycount].earlyhangup = yylval.num; break; + case IDLE_ALG_OUT: + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: idle-algorithm-outgoing = %s", entrycount, yylval.str))); + + if(!(strcmp(yylval.str, "fix-unit-size"))) + { + cfg_entry_tab[entrycount].shorthold_algorithm = msg_alg__fix_unit_size; + } + else if(!(strcmp(yylval.str, "var-unit-size"))) + { + cfg_entry_tab[entrycount].shorthold_algorithm = msg_alg__var_unit_size; + } + else + { + log(LL_ERR, "ERROR parsing config file: unknown parameter for keyword \"idle-algorithm-outgoing\" at line %d!", lineno); + config_error_flag++; + } + break; + case IDLETIME_IN: - log(LL_DBG, "entry %d: idle_time_in = %d", entrycount, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: idle_time_in = %d", entrycount, yylval.num))); cfg_entry_tab[entrycount].idle_time_in = yylval.num; break; case IDLETIME_OUT: - log(LL_DBG, "entry %d: idle_time_out = %d", entrycount, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: idle_time_out = %d", entrycount, yylval.num))); cfg_entry_tab[entrycount].idle_time_out = yylval.num; break; case ISDNCONTROLLER: cfg_entry_tab[entrycount].isdncontroller = yylval.num; - log(LL_DBG, "entry %d: isdncontroller = %d", entrycount, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: isdncontroller = %d", entrycount, yylval.num))); break; case ISDNCHANNEL: @@ -391,15 +414,15 @@ cfg_setval(int keyword) case 0: case -1: cfg_entry_tab[entrycount].isdnchannel = CHAN_ANY; - log(LL_DBG, "entry %d: isdnchannel = any", entrycount); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: isdnchannel = any", entrycount))); break; case 1: cfg_entry_tab[entrycount].isdnchannel = CHAN_B1; - log(LL_DBG, "entry %d: isdnchannel = one", entrycount); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: isdnchannel = one", entrycount))); break; case 2: cfg_entry_tab[entrycount].isdnchannel = CHAN_B2; - log(LL_DBG, "entry %d: isdnchannel = two", entrycount); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: isdnchannel = two", entrycount))); break; default: log(LL_DBG, "entry %d: isdnchannel value out of range", entrycount); @@ -409,52 +432,55 @@ cfg_setval(int keyword) break; case ISDNTIME: - log(LL_DBG, "system: isdntime = %d", yylval.booln); + DBGL(DL_RCCF, (log(LL_DBG, "system: isdntime = %d", yylval.booln))); isdntime = yylval.booln; break; case ISDNTXDELIN: cfg_entry_tab[entrycount].isdntxdelin = yylval.num; - log(LL_DBG, "entry %d: isdntxdel-incoming = %d", entrycount, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: isdntxdel-incoming = %d", entrycount, yylval.num))); break; case ISDNTXDELOUT: cfg_entry_tab[entrycount].isdntxdelout = yylval.num; - log(LL_DBG, "entry %d: isdntxdel-outgoing = %d", entrycount, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: isdntxdel-outgoing = %d", entrycount, yylval.num))); break; case LOCAL_PHONE_DIALOUT: - log(LL_DBG, "entry %d: local_phone_dialout = %s", entrycount, yylval.str); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: local_phone_dialout = %s", entrycount, yylval.str))); strcpy(cfg_entry_tab[entrycount].local_phone_dialout, yylval.str); break; case LOCAL_PHONE_INCOMING: - log(LL_DBG, "entry %d: local_phone_incoming = %s", entrycount, yylval.str); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: local_phone_incoming = %s", entrycount, yylval.str))); strcpy(cfg_entry_tab[entrycount].local_phone_incoming, yylval.str); break; case MONITORPORT: monitorport = yylval.num; - log(LL_DBG, "system: monitorport = %d", yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "system: monitorport = %d", yylval.num))); break; case MONITORSW: - if (yylval.booln && inhibit_monitor) { + if (yylval.booln && inhibit_monitor) + { do_monitor = 0; - log(LL_DBG, "system: monitor-enable overriden by command line flag"); - } else { - do_monitor = yylval.booln; - log(LL_DBG, "system: monitor-enable = %d", yylval.booln); + DBGL(DL_RCCF, (log(LL_DBG, "system: monitor-enable overriden by command line flag"))); + } + else + { + do_monitor = yylval.booln; + DBGL(DL_RCCF, (log(LL_DBG, "system: monitor-enable = %d", yylval.booln))); } break; case NAME: - log(LL_DBG, "entry %d: name = %s", entrycount, yylval.str); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: name = %s", entrycount, yylval.str))); strcpy(cfg_entry_tab[entrycount].name, yylval.str); break; case REACTION: - log(LL_DBG, "entry %d: dialin_reaction = %s", entrycount, yylval.str); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: dialin_reaction = %s", entrycount, yylval.str))); if(!(strcmp(yylval.str, "accept"))) cfg_entry_tab[entrycount].dialin_reaction = REACT_ACCEPT; else if(!(strcmp(yylval.str, "reject"))) @@ -480,8 +506,8 @@ cfg_setval(int keyword) break; } - log(LL_DBG, "entry %d: remote_phone_dialout #%d = %s", - entrycount, cfg_entry_tab[entrycount].remote_numbers_count, yylval.str); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: remote_phone_dialout #%d = %s", + entrycount, cfg_entry_tab[entrycount].remote_numbers_count, yylval.str))); strcpy(cfg_entry_tab[entrycount].remote_numbers[cfg_entry_tab[entrycount].remote_numbers_count].number, yylval.str); cfg_entry_tab[entrycount].remote_numbers[cfg_entry_tab[entrycount].remote_numbers_count].flag = 0; @@ -491,7 +517,7 @@ cfg_setval(int keyword) break; case REMOTE_NUMBERS_HANDLING: - log(LL_DBG, "entry %d: remdial_handling = %s", entrycount, yylval.str); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: remdial_handling = %s", entrycount, yylval.str))); if(!(strcmp(yylval.str, "next"))) cfg_entry_tab[entrycount].remote_numbers_handling = RNH_NEXT; else if(!(strcmp(yylval.str, "last"))) @@ -515,7 +541,7 @@ cfg_setval(int keyword) config_error_flag++; break; } - log(LL_DBG, "entry %d: remote_phone_incoming #%d = %s", entrycount, n, yylval.str); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: remote_phone_incoming #%d = %s", entrycount, n, yylval.str))); strcpy(cfg_entry_tab[entrycount].remote_phone_incoming[n].number, yylval.str); cfg_entry_tab[entrycount].incoming_numbers_count++; } @@ -523,11 +549,11 @@ cfg_setval(int keyword) case RATESFILE: strcpy(ratesfile, yylval.str); - log(LL_DBG, "system: ratesfile = %s", yylval.str); + DBGL(DL_RCCF, (log(LL_DBG, "system: ratesfile = %s", yylval.str))); break; case RATETYPE: - log(LL_DBG, "entry %d: ratetype = %d", entrycount, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: ratetype = %d", entrycount, yylval.num))); cfg_entry_tab[entrycount].ratetype = yylval.num; break; @@ -535,17 +561,17 @@ cfg_setval(int keyword) if(yylval.num < RECOVERYTIME_MIN) { yylval.num = RECOVERYTIME_MIN; - log(LL_DBG, "entry %d: recoverytime < %d, min = %d", entrycount, RECOVERYTIME_MIN, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: recoverytime < %d, min = %d", entrycount, RECOVERYTIME_MIN, yylval.num))); } - log(LL_DBG, "entry %d: recoverytime = %d", entrycount, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: recoverytime = %d", entrycount, yylval.num))); cfg_entry_tab[entrycount].recoverytime = yylval.num; break; case REGEXPR: if(nregexpr >= MAX_RE) { - log(LL_DBG, "system: regexpr #%d >= MAX_RE", nregexpr); + log(LL_ERR, "system: regexpr #%d >= MAX_RE", nregexpr); config_error_flag++; break; } @@ -554,7 +580,7 @@ cfg_setval(int keyword) { char buf[256]; regerror(i, &(rarr[nregexpr].re), buf, sizeof(buf)); - log(LL_DBG, "system: regcomp error for %s: [%s]", yylval.str, buf); + log(LL_ERR, "system: regcomp error for %s: [%s]", yylval.str, buf); config_error_flag++; break; } @@ -562,13 +588,13 @@ cfg_setval(int keyword) { if((rarr[nregexpr].re_expr = malloc(strlen(yylval.str)+1)) == NULL) { - log(LL_DBG, "system: regexpr malloc error error for %s", yylval.str); + log(LL_ERR, "system: regexpr malloc error error for %s", yylval.str); config_error_flag++; break; } strcpy(rarr[nregexpr].re_expr, yylval.str); - log(LL_DBG, "system: regexpr %s stored into slot %d", yylval.str, nregexpr); + DBGL(DL_RCCF, (log(LL_DBG, "system: regexpr %s stored into slot %d", yylval.str, nregexpr))); if(rarr[nregexpr].re_prog != NULL) rarr[nregexpr].re_flg = 1; @@ -581,19 +607,19 @@ cfg_setval(int keyword) case REGPROG: if(nregprog >= MAX_RE) { - log(LL_DBG, "system: regprog #%d >= MAX_RE", nregprog); + log(LL_ERR, "system: regprog #%d >= MAX_RE", nregprog); config_error_flag++; break; } if((rarr[nregprog].re_prog = malloc(strlen(yylval.str)+1)) == NULL) { - log(LL_DBG, "system: regprog malloc error error for %s", yylval.str); + log(LL_ERR, "system: regprog malloc error error for %s", yylval.str); config_error_flag++; break; } strcpy(rarr[nregprog].re_prog, yylval.str); - log(LL_DBG, "system: regprog %s stored into slot %d", yylval.str, nregprog); + DBGL(DL_RCCF, (log(LL_DBG, "system: regprog %s stored into slot %d", yylval.str, nregprog))); if(rarr[nregprog].re_expr != NULL) rarr[nregprog].re_flg = 1; @@ -607,11 +633,11 @@ cfg_setval(int keyword) if(rt_prio < RTP_PRIO_MIN || rt_prio > RTP_PRIO_MAX) { config_error_flag++; - log(LL_DBG, "system: error, rtprio (%d) out of range!", yylval.num); + log(LL_ERR, "system: error, rtprio (%d) out of range!", yylval.num); } else { - log(LL_DBG, "system: rtprio = %d", yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "system: rtprio = %d", yylval.num))); } #else rt_prio = RTPRIO_NOTUSED; @@ -619,12 +645,12 @@ cfg_setval(int keyword) break; case UNITLENGTH: - log(LL_DBG, "entry %d: unitlength = %d", entrycount, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: unitlength = %d", entrycount, yylval.num))); cfg_entry_tab[entrycount].unitlength = yylval.num; break; case UNITLENGTHSRC: - log(LL_DBG, "entry %d: unitlengthsrc = %s", entrycount, yylval.str); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: unitlengthsrc = %s", entrycount, yylval.str))); if(!(strcmp(yylval.str, "none"))) cfg_entry_tab[entrycount].unitlengthsrc = ULSRC_NONE; else if(!(strcmp(yylval.str, "cmdl"))) @@ -643,7 +669,7 @@ cfg_setval(int keyword) break; case USRDEVICENAME: - log(LL_DBG, "entry %d: usrdevicename = %s", entrycount, yylval.str); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: usrdevicename = %s", entrycount, yylval.str))); if(!strcmp(yylval.str, "rbch")) cfg_entry_tab[entrycount].usrdevicename = BDRV_RBCH; else if(!strcmp(yylval.str, "tel")) @@ -652,6 +678,8 @@ cfg_setval(int keyword) cfg_entry_tab[entrycount].usrdevicename = BDRV_IPR; else if(!strcmp(yylval.str, "isp")) cfg_entry_tab[entrycount].usrdevicename = BDRV_ISPPP; + else if(!strcmp(yylval.str, "ibc")) + cfg_entry_tab[entrycount].usrdevicename = BDRV_IBC; else { log(LL_ERR, "ERROR parsing config file: unknown parameter for keyword \"usrdevicename\" at line %d!", lineno); @@ -660,17 +688,17 @@ cfg_setval(int keyword) break; case USRDEVICEUNIT: - log(LL_DBG, "entry %d: usrdeviceunit = %d", entrycount, yylval.num); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: usrdeviceunit = %d", entrycount, yylval.num))); cfg_entry_tab[entrycount].usrdeviceunit = yylval.num; break; case USEACCTFILE: useacctfile = yylval.booln; - log(LL_DBG, "system: useacctfile = %d", yylval.booln); + DBGL(DL_RCCF, (log(LL_DBG, "system: useacctfile = %d", yylval.booln))); break; case USEDOWN: - log(LL_DBG, "entry %d: usedown = %d", entrycount, yylval.booln); + DBGL(DL_RCCF, (log(LL_DBG, "entry %d: usedown = %d", entrycount, yylval.booln))); cfg_entry_tab[entrycount].usedown = yylval.booln; break; @@ -1071,8 +1099,18 @@ print_config(void) } if(!((cep->inout == DIR_INONLY) || (cep->usrdevicename == BDRV_TEL))) + { + char *s; fprintf(PFILE, "idletime-outgoing = %d\t\t# outgoing call idle timeout\n", cep->idle_time_out); + switch( cep->shorthold_algorithm ) + { + case msg_alg__fix_unit_size: s = "fix-unit-size"; break; + case msg_alg__var_unit_size: s = "var-unit-size"; break; + default: s = "error!!!"; break; + } + fprintf(PFILE, "idle-algorithm-outgoing = %s\t\t# outgoing call idle algorithm\n", s); + } if(!(cep->inout == DIR_OUTONLY)) fprintf(PFILE, "idletime-incoming = %d\t\t# incoming call idle timeout\n", cep->idle_time_in); diff --git a/usr.sbin/i4b/isdnd/rc_parse.y b/usr.sbin/i4b/isdnd/rc_parse.y index 6c1cf14..8e00b78 100644 --- a/usr.sbin/i4b/isdnd/rc_parse.y +++ b/usr.sbin/i4b/isdnd/rc_parse.y @@ -1,7 +1,7 @@ /* * Copyright (c) 1997 Joerg Wunsch. All rights reserved. * - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,9 +30,9 @@ * i4b daemon - runtime configuration parser * ----------------------------------------- * - * $Id: rc_parse.y,v 1.15 1998/12/05 18:03:38 hm Exp $ + * $Id: rc_parse.y,v 1.18 1999/02/23 16:25:49 hm Exp $ * - * last edit-date: [Sat Dec 5 18:12:26 1998] + * last edit-date: [Tue Feb 23 16:42:02 1999] * *---------------------------------------------------------------------------*/ @@ -76,6 +76,7 @@ int entrycount = -1; %token ALIASFNAME %token ANSWERPROG %token B1PROTOCOL +%token BEEPCONNECT %token CALLBACKWAIT %token CALLEDBACKWAIT %token CONNECTPROG @@ -90,6 +91,7 @@ int entrycount = -1; %token ENTRY %token IDLETIME_IN %token IDLETIME_OUT +%token IDLE_ALG_OUT %token ISDNCONTROLLER %token ISDNCHANNEL %token ISDNTIME @@ -290,6 +292,7 @@ sysfilekeyword: RATESFILE { $$ = RATESFILE; } sysboolkeyword: USEACCTFILE { $$ = USEACCTFILE; } | ALIASING { $$ = ALIASING; } | ACCTALL { $$ = ACCTALL; } + | BEEPCONNECT { $$ = BEEPCONNECT; } | ISDNTIME { $$ = ISDNTIME; } | MONITORSW { $$ = MONITORSW; } ; @@ -351,6 +354,7 @@ strkeyword: ANSWERPROG { $$ = ANSWERPROG; } | DIALOUTTYPE { $$ = DIALOUTTYPE; } | DIRECTION { $$ = DIRECTION; } | DISCONNECTPROG { $$ = DISCONNECTPROG; } + | IDLE_ALG_OUT { $$ = IDLE_ALG_OUT; } | LOCAL_PHONE_INCOMING { $$ = LOCAL_PHONE_INCOMING; } | LOCAL_PHONE_DIALOUT { $$ = LOCAL_PHONE_DIALOUT; } | NAME { $$ = NAME; } diff --git a/usr.sbin/i4b/isdnd/rc_scan.l b/usr.sbin/i4b/isdnd/rc_scan.l index dfca28c..2a286c9 100644 --- a/usr.sbin/i4b/isdnd/rc_scan.l +++ b/usr.sbin/i4b/isdnd/rc_scan.l @@ -1,7 +1,7 @@ /* * Copyright (c) 1997 Joerg Wunsch. All rights reserved. * - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,9 +30,9 @@ * i4b daemon - runtime configuration lexical analyzer * --------------------------------------------------- * - * $Id: rc_scan.l,v 1.19 1998/12/18 17:17:57 hm Exp $ + * $Id: rc_scan.l,v 1.22 1999/02/23 16:25:49 hm Exp $ * - * last edit-date: [Fri Dec 18 18:08:25 1998] + * last edit-date: [Tue Feb 23 16:41:02 1999] * *---------------------------------------------------------------------------*/ @@ -92,6 +92,7 @@ aliasing { return ALIASING; } aliasfile { return ALIASFNAME; } answerprog { return ANSWERPROG; } b1protocol { return B1PROTOCOL; } +beepconnect { return BEEPCONNECT; } callbackwait { return CALLBACKWAIT; } calledbackwait { return CALLEDBACKWAIT; } connectprog { return CONNECTPROG; } @@ -107,6 +108,7 @@ earlyhangup { return EARLYHANGUP; } entry { return ENTRY; } idletime-incoming { return IDLETIME_IN; } idletime-outgoing { return IDLETIME_OUT; } +idle-algorithm-outgoing { return IDLE_ALG_OUT; } isdncontroller { return ISDNCONTROLLER; } isdnchannel { return ISDNCHANNEL; } isdntime { return ISDNTIME; } diff --git a/usr.sbin/i4b/isdnd/support.c b/usr.sbin/i4b/isdnd/support.c index 77c0841..ac3ca1b 100644 --- a/usr.sbin/i4b/isdnd/support.c +++ b/usr.sbin/i4b/isdnd/support.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * i4b daemon - misc support routines * ---------------------------------- * - * $Id: support.c,v 1.43 1998/12/18 09:47:09 hm Exp $ + * $Id: support.c,v 1.48 1999/02/17 14:31:42 hm Exp $ * - * last edit-date: [Mon Dec 14 11:17:22 1998] + * last edit-date: [Mon Feb 15 16:40:05 1999] * *---------------------------------------------------------------------------*/ @@ -511,7 +511,8 @@ name_of_controller(int ctrl_type, int card_type) "Siemens I-Talk", "ELSA MicroLink ISDN/MC", "ELSA MicroLink MCall", - "ITK ix1 micro" + "ITK ix1 micro", + "AVM Fritz!Card PCI" }; static char *daic_card[] = { "EICON.Diehl S", @@ -573,7 +574,7 @@ init_controller(void) do_exit(1); } } - log(LL_DMN, "init_controller: found %d ISDN controller(s)", max); + DBGL(DL_RCCF, (log(LL_DBG, "init_controller: found %d ISDN controller(s)", max))); } /*---------------------------------------------------------------------------* @@ -586,10 +587,11 @@ bdrivername(int drivertype) "rbch", "tel", "ipr", - "isp" + "isp", + "ibc" }; - if(drivertype >= BDRV_RBCH && drivertype <= BDRV_ISPPP) + if(drivertype >= BDRV_RBCH && drivertype <= BDRV_IBC) return(bdtab[drivertype]); else return("unknown"); @@ -659,9 +661,29 @@ unitlen_chkupd(cfg_entry_t *cep) /* XXX check if the values are possible, if not, adjust them */ tupd.cdid = cep->cdid; - tupd.unitlen_time = cep->unitlength; - tupd.idle_time = cep->idle_time_out; - tupd.earlyhup_time = cep->earlyhangup; + + /* init the short hold data based on the shorthold algorithm type */ + + switch( cep->shorthold_algorithm ) + { + + case msg_alg__fix_unit_size: + tupd.shorthold_data.shorthold_algorithm = msg_alg__fix_unit_size; + tupd.shorthold_data.unitlen_time = cep->unitlength; + tupd.shorthold_data.idle_time = cep->idle_time_out; + tupd.shorthold_data.earlyhup_time = cep->earlyhangup; + break; + + case msg_alg__var_unit_size: + tupd.shorthold_data.shorthold_algorithm = msg_alg__var_unit_size; + tupd.shorthold_data.unitlen_time = cep->unitlength; + tupd.shorthold_data.idle_time = cep->idle_time_out; + tupd.shorthold_data.earlyhup_time = 0; + break; + default: + log(LL_ERR, "unitlen_chkupd bad shorthold_algorithm %d", cep->shorthold_algorithm ); + + } if((ioctl(isdnfd, I4B_TIMEOUT_UPD, &tupd)) < 0) { diff --git a/usr.sbin/i4b/isdnd/timer.c b/usr.sbin/i4b/isdnd/timer.c index 5534efe..7bbd09fc 100644 --- a/usr.sbin/i4b/isdnd/timer.c +++ b/usr.sbin/i4b/isdnd/timer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * i4b daemon - timer/timing support routines * ------------------------------------------ * - * $Id: timer.c,v 1.16 1998/12/05 18:03:43 hm Exp $ + * $Id: timer.c,v 1.17 1999/02/14 09:44:57 hm Exp $ * - * last edit-date: [Sat Dec 5 18:13:10 1998] + * last edit-date: [Sun Feb 14 10:12:32 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdndebug/isdndebug.8 b/usr.sbin/i4b/isdndebug/isdndebug.8 index f3903e3..23f4b56 100644 --- a/usr.sbin/i4b/isdndebug/isdndebug.8 +++ b/usr.sbin/i4b/isdndebug/isdndebug.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: isdndebug.8,v 1.4 1998/12/05 18:03:47 hm Exp $ +.\" $Id: isdndebug.8,v 1.6 1999/02/15 16:48:04 hm Exp $ .\" -.\" last edit-date: [Sat Dec 5 18:13:34 1998] +.\" last edit-date: [Mon Feb 15 17:05:41 1999] .\" .\" -hm writing manual pages .\" -hm getting uptodate @@ -64,7 +64,7 @@ Set debugging mask for the selected layer(s) to display errors only. .It Fl g Get the debugging mask for the selected layer(s). .It Fl h -Display the the HSCX error counters. +Display the HSCX error counters. .It Fl l Specify the layer for which a command applies. Default is all layers. .It Fl m diff --git a/usr.sbin/i4b/isdndebug/main.c b/usr.sbin/i4b/isdndebug/main.c index 7fdbf7f..91c1e66 100644 --- a/usr.sbin/i4b/isdndebug/main.c +++ b/usr.sbin/i4b/isdndebug/main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * main.c - i4b set debug options * ------------------------------ * - * $Id: main.c,v 1.13 1998/12/05 18:03:49 hm Exp $ + * $Id: main.c,v 1.14 1999/02/14 09:44:57 hm Exp $ * - * last edit-date: [Sat Dec 5 18:13:55 1998] + * last edit-date: [Sun Feb 14 10:13:25 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdndecode/decode.h b/usr.sbin/i4b/isdndecode/decode.h index 0eec0ab..0a88ae7 100644 --- a/usr.sbin/i4b/isdndecode/decode.h +++ b/usr.sbin/i4b/isdndecode/decode.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * decode.h - isdndecode header file * --------------------------------- * - * $Id: decode.h,v 1.4 1998/12/18 17:09:38 hm Exp $ + * $Id: decode.h,v 1.5 1999/02/14 09:44:57 hm Exp $ * - * last edit-date: [Fri Dec 18 18:10:13 1998] + * last edit-date: [Sun Feb 14 10:15:59 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdndecode/facility.c b/usr.sbin/i4b/isdndecode/facility.c index 5735abb..183ff50 100644 --- a/usr.sbin/i4b/isdndecode/facility.c +++ b/usr.sbin/i4b/isdndecode/facility.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * facility.c - decode Q.932 facilities * ------------------------------------ * - * $Id: facility.c,v 1.2 1998/12/18 17:09:38 hm Exp $ + * $Id: facility.c,v 1.3 1999/02/14 09:44:57 hm Exp $ * - * last edit-date: [Fri Dec 18 18:10:32 1998] + * last edit-date: [Sun Feb 14 10:16:11 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdndecode/facility.h b/usr.sbin/i4b/isdndecode/facility.h index 7080c22..2c6475f 100644 --- a/usr.sbin/i4b/isdndecode/facility.h +++ b/usr.sbin/i4b/isdndecode/facility.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * facility.h - Q.932 facility header file * --------------------------------------- * - * $Id: facility.h,v 1.2 1998/12/18 17:09:38 hm Exp $ + * $Id: facility.h,v 1.3 1999/02/14 09:44:57 hm Exp $ * - * last edit-date: [Fri Dec 18 18:10:48 1998] + * last edit-date: [Sun Feb 14 10:16:17 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdndecode/isdndecode.8 b/usr.sbin/i4b/isdndecode/isdndecode.8 index 8594686..0de016d 100644 --- a/usr.sbin/i4b/isdndecode/isdndecode.8 +++ b/usr.sbin/i4b/isdndecode/isdndecode.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1998, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: isdndecode.8,v 1.3 1998/12/18 17:09:38 hm Exp $ +.\" $Id: isdndecode.8,v 1.4 1999/02/14 09:44:57 hm Exp $ .\" -.\" last edit-date: [Fri Dec 18 18:11:31 1998] +.\" last edit-date: [Sun Feb 14 10:16:25 1999] .\" .\" -hm writing manual page .\" diff --git a/usr.sbin/i4b/isdndecode/layer1.c b/usr.sbin/i4b/isdndecode/layer1.c index 8dee4b7..8df7bc5 100644 --- a/usr.sbin/i4b/isdndecode/layer1.c +++ b/usr.sbin/i4b/isdndecode/layer1.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * layer1.c - isdndecode, decode and print layer 1 information * ----------------------------------------------------------- * - * $Id: layer1.c,v 1.2 1998/12/18 17:09:38 hm Exp $ + * $Id: layer1.c,v 1.3 1999/02/14 09:44:57 hm Exp $ * - * last edit-date: [Fri Dec 18 18:11:55 1998] + * last edit-date: [Sun Feb 14 10:16:40 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdndecode/layer2.c b/usr.sbin/i4b/isdndecode/layer2.c index b7997dd..20ce9cb 100644 --- a/usr.sbin/i4b/isdndecode/layer2.c +++ b/usr.sbin/i4b/isdndecode/layer2.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * layer2.c - decode and print layer 2 (Q.921) information * ------------------------------------------------------- * - * $Id: layer2.c,v 1.3 1998/12/18 17:09:38 hm Exp $ + * $Id: layer2.c,v 1.4 1999/02/14 09:44:57 hm Exp $ * - * last edit-date: [Fri Dec 18 18:12:09 1998] + * last edit-date: [Sun Feb 14 10:16:46 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdndecode/layer3.c b/usr.sbin/i4b/isdndecode/layer3.c index 6376a13..1542c10 100644 --- a/usr.sbin/i4b/isdndecode/layer3.c +++ b/usr.sbin/i4b/isdndecode/layer3.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * layer3.c - decode and print layer 3 (Q.931) information * ------------------------------------------------------- * - * $Id: layer3.c,v 1.5 1998/12/18 17:09:38 hm Exp $ + * $Id: layer3.c,v 1.6 1999/02/14 09:44:57 hm Exp $ * - * last edit-date: [Fri Dec 18 18:12:21 1998] + * last edit-date: [Sun Feb 14 10:16:52 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdndecode/layer3_subr.c b/usr.sbin/i4b/isdndecode/layer3_subr.c index e1480b6..78671c5 100644 --- a/usr.sbin/i4b/isdndecode/layer3_subr.c +++ b/usr.sbin/i4b/isdndecode/layer3_subr.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * layer3_subr.c - subroutines for IE decoding * ------------------------------------------- * - * $Id: layer3_subr.c,v 1.4 1998/12/18 17:09:38 hm Exp $ + * $Id: layer3_subr.c,v 1.5 1999/02/14 09:44:57 hm Exp $ * - * last edit-date: [Fri Dec 18 18:12:37 1998] + * last edit-date: [Sun Feb 14 10:16:58 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdndecode/main.c b/usr.sbin/i4b/isdndecode/main.c index a73d708..fd3774a 100644 --- a/usr.sbin/i4b/isdndecode/main.c +++ b/usr.sbin/i4b/isdndecode/main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * main.c - isdndecode main program file * ------------------------------------- * - * $Id: main.c,v 1.6 1998/12/18 17:09:38 hm Exp $ + * $Id: main.c,v 1.7 1999/02/14 09:44:57 hm Exp $ * - * last edit-date: [Fri Dec 18 18:12:52 1998] + * last edit-date: [Sun Feb 14 10:17:04 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdndecode/pcause.c b/usr.sbin/i4b/isdndecode/pcause.c index 9c5535e..c2b28b1 100644 --- a/usr.sbin/i4b/isdndecode/pcause.c +++ b/usr.sbin/i4b/isdndecode/pcause.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * pcause.c - printing cause values * -------------------------------- * - * $Id: pcause.c,v 1.3 1998/12/23 10:03:55 hm Exp $ + * $Id: pcause.c,v 1.4 1999/02/14 09:44:57 hm Exp $ * - * last edit-date: [Wed Dec 23 10:59:54 1998] + * last edit-date: [Sun Feb 14 10:17:10 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdndecode/pcause.h b/usr.sbin/i4b/isdndecode/pcause.h index 6b6627b..765bc3a 100644 --- a/usr.sbin/i4b/isdndecode/pcause.h +++ b/usr.sbin/i4b/isdndecode/pcause.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * pcause.h - Q.850 causes definitions * ----------------------------------- * - * $Id: pcause.h,v 1.2 1998/12/18 17:09:38 hm Exp $ + * $Id: pcause.h,v 1.3 1999/02/14 09:44:57 hm Exp $ * - * last edit-date: [Fri Dec 18 18:13:23 1998] + * last edit-date: [Sun Feb 14 10:17:15 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdnmonitor/isdnmonitor.8 b/usr.sbin/i4b/isdnmonitor/isdnmonitor.8 index 9bcb783..5da1eba 100644 --- a/usr.sbin/i4b/isdnmonitor/isdnmonitor.8 +++ b/usr.sbin/i4b/isdnmonitor/isdnmonitor.8 @@ -20,7 +20,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Id: isdnmonitor.8,v 1.2 1998/08/10 13:55:29 hm Exp $ +.\" $Id: isdnmonitor.8,v 1.3 1999/02/14 09:44:57 hm Exp $ .\" .\" last edit-date: [Fri Jan 30 22:49:48 1998] .\" diff --git a/usr.sbin/i4b/isdnmonitor/main.c b/usr.sbin/i4b/isdnmonitor/main.c index 73ae8fe..d1903de 100644 --- a/usr.sbin/i4b/isdnmonitor/main.c +++ b/usr.sbin/i4b/isdnmonitor/main.c @@ -33,7 +33,7 @@ * i4b daemon - network monitor client * ----------------------------------- * - * $Id: main.c,v 1.9 1998/10/27 10:54:23 hm Exp $ + * $Id: main.c,v 1.10 1999/02/14 09:44:57 hm Exp $ * * last edit-date: [Tue Oct 27 11:53:12 1998] * diff --git a/usr.sbin/i4b/isdnmonitor/monitor.h b/usr.sbin/i4b/isdnmonitor/monitor.h index 0025449..ff192d0 100644 --- a/usr.sbin/i4b/isdnmonitor/monitor.h +++ b/usr.sbin/i4b/isdnmonitor/monitor.h @@ -33,7 +33,7 @@ * i4b daemon - network monitor protocl definition * ----------------------------------------------- * - * $Id: monitor.h,v 1.4 1998/08/10 13:55:32 hm Exp $ + * $Id: monitor.h,v 1.5 1999/02/14 09:44:57 hm Exp $ * * last edit-date: [Mon Aug 3 06:52:06 1998] * diff --git a/usr.sbin/i4b/isdntel/alias.c b/usr.sbin/i4b/isdntel/alias.c index fa02ea9..95ca985 100644 --- a/usr.sbin/i4b/isdntel/alias.c +++ b/usr.sbin/i4b/isdntel/alias.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * isdntel - isdn4bsd telephone answering machine support * ====================================================== * - * $Id: alias.c,v 1.5 1998/12/05 18:03:51 hm Exp $ + * $Id: alias.c,v 1.6 1999/02/14 09:44:57 hm Exp $ * - * last edit-date: [Sat Dec 5 18:15:02 1998] + * last edit-date: [Sun Feb 14 10:19:13 1999] * *----------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdntel/alias.h b/usr.sbin/i4b/isdntel/alias.h index 98b91da..7540ac0 100644 --- a/usr.sbin/i4b/isdntel/alias.h +++ b/usr.sbin/i4b/isdntel/alias.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * isdn4bsd common alias file handling header * ========================================== * - * $Id: alias.h,v 1.3 1998/12/05 18:03:52 hm Exp $ + * $Id: alias.h,v 1.4 1999/02/14 09:44:57 hm Exp $ * - * last edit-date: [Sat Dec 5 18:15:13 1998] + * last edit-date: [Sun Feb 14 10:19:20 1999] * *----------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdntel/defs.h b/usr.sbin/i4b/isdntel/defs.h index e9233c3..35d1b1e 100644 --- a/usr.sbin/i4b/isdntel/defs.h +++ b/usr.sbin/i4b/isdntel/defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * isdntel - isdn4bsd telephone answering support * ============================================== * - * $Id: defs.h,v 1.6 1998/12/05 18:03:53 hm Exp $ + * $Id: defs.h,v 1.7 1999/02/14 09:44:57 hm Exp $ * - * last edit-date: [Sat Dec 5 18:15:26 1998] + * last edit-date: [Sun Feb 14 10:19:26 1999] * *----------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdntel/display.c b/usr.sbin/i4b/isdntel/display.c index 1cc0034..8b837dd 100644 --- a/usr.sbin/i4b/isdntel/display.c +++ b/usr.sbin/i4b/isdntel/display.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * isdntel - isdn4bsd telephone answering machine support * ====================================================== * - * $Id: display.c,v 1.4 1998/12/05 18:03:55 hm Exp $ + * $Id: display.c,v 1.5 1999/02/14 09:44:57 hm Exp $ * - * last edit-date: [Sat Dec 5 18:15:40 1998] + * last edit-date: [Sun Feb 14 10:19:32 1999] * *----------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdntel/files.c b/usr.sbin/i4b/isdntel/files.c index ea153f5..d5d6a76 100644 --- a/usr.sbin/i4b/isdntel/files.c +++ b/usr.sbin/i4b/isdntel/files.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * isdntel - isdn4bsd telephone answering machine support * ====================================================== * - * $Id: files.c,v 1.6 1998/12/05 18:03:56 hm Exp $ + * $Id: files.c,v 1.7 1999/02/14 09:44:57 hm Exp $ * - * last edit-date: [Sat Dec 5 18:15:57 1998] + * last edit-date: [Sun Feb 14 10:19:38 1999] * *----------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdntel/isdntel.8 b/usr.sbin/i4b/isdntel/isdntel.8 index d87c848..45d9de1 100644 --- a/usr.sbin/i4b/isdntel/isdntel.8 +++ b/usr.sbin/i4b/isdntel/isdntel.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" last edit-date: [Sat Dec 5 18:16:19 1998] +.\" last edit-date: [Sun Feb 14 10:19:44 1999] .\" -.\" $Id: isdntel.8,v 1.6 1998/12/05 18:03:58 hm Exp $ +.\" $Id: isdntel.8,v 1.7 1999/02/14 09:44:57 hm Exp $ .\" .Dd July 11, 1998 .Dt isdntel 8 diff --git a/usr.sbin/i4b/isdntel/main.c b/usr.sbin/i4b/isdntel/main.c index fd6a3b2..5f80440 100644 --- a/usr.sbin/i4b/isdntel/main.c +++ b/usr.sbin/i4b/isdntel/main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * isdntel - isdn4bsd telephone answering machine support * ====================================================== * - * $Id: main.c,v 1.6 1998/12/05 18:03:59 hm Exp $ + * $Id: main.c,v 1.7 1999/02/14 09:44:57 hm Exp $ * - * last edit-date: [Sat Dec 5 18:16:33 1998] + * last edit-date: [Sun Feb 14 10:19:50 1999] * *----------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdntelctl/isdntelctl.8 b/usr.sbin/i4b/isdntelctl/isdntelctl.8 index 2bd45d2..945bfc2 100644 --- a/usr.sbin/i4b/isdntelctl/isdntelctl.8 +++ b/usr.sbin/i4b/isdntelctl/isdntelctl.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: isdntelctl.8,v 1.4 1998/12/14 10:31:55 hm Exp $ +.\" $Id: isdntelctl.8,v 1.6 1999/02/16 10:40:18 hm Exp $ .\" -.\" last edit-date: [Mon Dec 14 11:34:51 1998] +.\" last edit-date: [Sun Feb 14 10:20:38 1999] .\" .Dd December 14, 1998 .Dt isdntelctl 8 @@ -38,6 +38,7 @@ .Op Fl u Ar unit .Op Fl A .Op Fl U +.Op Fl R .Sh DESCRIPTION .Nm isdntelctl is part of the isdn4bsd package and is used to configure the sound format @@ -56,6 +57,14 @@ device /dev/i4btel0. Set sound format to A-Law. .It Fl U Set sound format to u-Law. +.It Fl R +Set sound format to canonical (regular) A-Law format. +.El +.Pp +By default, isdn4bsd sends and receives audio in A-Law as provided by the +hardware. However, these samples cannot easily be processed further as the +sample word is bit-reversed. Both the u-Law and canonical A-Law formats +store samples in a way suitable for post-processing by e.\ g. sox(1). .Pp .Sh FILES /dev/i4btel<n> diff --git a/usr.sbin/i4b/isdntelctl/main.c b/usr.sbin/i4b/isdntelctl/main.c index 4309b24..aec72f6 100644 --- a/usr.sbin/i4b/isdntelctl/main.c +++ b/usr.sbin/i4b/isdntelctl/main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * isdntelctl - i4b set telephone interface options * ------------------------------------------------ * - * $Id: main.c,v 1.4 1998/12/14 10:31:57 hm Exp $ + * $Id: main.c,v 1.7 1999/02/16 10:40:18 hm Exp $ * - * last edit-date: [Sat Dec 5 18:17:17 1998] + * last edit-date: [Tue Feb 16 11:32:09 1999] * *---------------------------------------------------------------------------*/ @@ -58,6 +58,7 @@ int opt_unit = 0; int opt_U = 0; int opt_A = 0; int opt_C = 0; +int opt_R = 0; /*---------------------------------------------------------------------------* * program entry @@ -70,7 +71,7 @@ main(int argc, char **argv) int telfd; char namebuffer[128]; - while ((c = getopt(argc, argv, "cgu:AU?")) != EOF) + while ((c = getopt(argc, argv, "cgu:AUR?")) != EOF) { switch(c) { @@ -96,6 +97,10 @@ main(int argc, char **argv) opt_U = 1; break; + case 'R': + opt_R = 1; + break; + case '?': default: usage(); @@ -103,12 +108,12 @@ main(int argc, char **argv) } } - if(opt_get == 0 && opt_U == 0 && opt_A && opt_C == 0) + if(opt_get == 0 && opt_R == 0 && opt_U == 0 && opt_A == 0 && opt_C == 0) { opt_get = 1; } - if((opt_get + opt_U + opt_A + opt_C) > 1) + if((opt_get + opt_R + opt_U + opt_A + opt_C) > 1) { usage(); } @@ -139,6 +144,10 @@ main(int argc, char **argv) { printf("device %s uses u-Law sound format\n", namebuffer); } + else if(format == CVT_ALAW_CANON) + { + printf("device %s uses canonical A-Law sound format\n", namebuffer); + } else { printf("ERROR, device %s uses unknown format %d!\n", namebuffer, format); @@ -169,6 +178,17 @@ main(int argc, char **argv) } exit(0); } + if(opt_R) + { + int format = CVT_ALAW_CANON; + + if((ret = ioctl(telfd, I4B_TEL_SETAUDIOFMT, &format)) < 0) + { + fprintf(stderr, "ioctl I4B_TEL_SETAUDIOFMT failed: %s", strerror(errno)); + exit(1); + } + exit(0); + } if(opt_C) { int dummy; @@ -190,11 +210,12 @@ usage(void) { fprintf(stderr, "\n"); fprintf(stderr, "isdntelctl - i4b telephone i/f control, compiled %s %s\n",__DATE__, __TIME__); - fprintf(stderr, "usage: isdndebug -e -h -g -l <layer> -m -r -s <value> -u <unit> -z -H\n"); + fprintf(stderr, "usage: isdntelctl -g -u <unit> -A -U -c\n"); fprintf(stderr, " -g get current settings\n"); fprintf(stderr, " -u unit specify unit number\n"); fprintf(stderr, " -A set interface to A-Law coding\n"); fprintf(stderr, " -U set interface to u-Law coding\n"); + fprintf(stderr, " -R set interface to canonical (regular) A-Law coding\n"); fprintf(stderr, " -c clear input queue\n"); fprintf(stderr, "\n"); exit(1); diff --git a/usr.sbin/i4b/isdntest/isdntest.8 b/usr.sbin/i4b/isdntest/isdntest.8 index 7e03523..d9c7cf7 100644 --- a/usr.sbin/i4b/isdntest/isdntest.8 +++ b/usr.sbin/i4b/isdntest/isdntest.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: isdntest.8,v 1.6 1998/12/16 13:39:47 hm Exp $ +.\" $Id: isdntest.8,v 1.7 1999/02/14 09:44:58 hm Exp $ .\" -.\" last edit-date: [Sat Dec 5 18:17:35 1998] +.\" last edit-date: [Sun Feb 14 10:21:18 1999] .\" .Dd July 9, 1998 .Dt isdntest 8 diff --git a/usr.sbin/i4b/isdntest/main.c b/usr.sbin/i4b/isdntest/main.c index 8e75be2..1ac2d91 100644 --- a/usr.sbin/i4b/isdntest/main.c +++ b/usr.sbin/i4b/isdntest/main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * main.c - i4b selftest utility * ----------------------------- * - * $Id: main.c,v 1.9 1998/12/05 18:04:06 hm Exp $ + * $Id: main.c,v 1.10 1999/02/14 09:44:58 hm Exp $ * - * last edit-date: [Sat Dec 5 18:18:17 1998] + * last edit-date: [Sun Feb 14 10:21:23 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdntrace/1tr6.c b/usr.sbin/i4b/isdntrace/1tr6.c index 1c8c184..363d35d 100644 --- a/usr.sbin/i4b/isdntrace/1tr6.c +++ b/usr.sbin/i4b/isdntrace/1tr6.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * 1tr6.c - print 1TR6 protocol traces * ----------------------------------- * - * $Id: 1tr6.c,v 1.4 1998/12/05 18:04:08 hm Exp $ + * $Id: 1tr6.c,v 1.5 1999/02/14 09:44:58 hm Exp $ * - * last edit-date: [Sat Dec 5 18:18:38 1998] + * last edit-date: [Sun Feb 14 10:22:11 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdntrace/cable.txt b/usr.sbin/i4b/isdntrace/cable.txt index 890d8d4..fcee79b 100644 --- a/usr.sbin/i4b/isdntrace/cable.txt +++ b/usr.sbin/i4b/isdntrace/cable.txt @@ -3,7 +3,7 @@ * Custom cable to trace an ISDN S0 bus with two passive (!) ISDN boards * --------------------------------------------------------------------- * - * $Id: cable.txt,v 1.2 1998/01/22 20:39:49 hm Exp $ + * $Id: cable.txt,v 1.3 1999/02/14 09:44:58 hm Exp $ * * last edit-date: [Thu Jan 22 19:57:50 1998] * diff --git a/usr.sbin/i4b/isdntrace/isdntrace.8 b/usr.sbin/i4b/isdntrace/isdntrace.8 index 62c5d07..a2c0ea6 100644 --- a/usr.sbin/i4b/isdntrace/isdntrace.8 +++ b/usr.sbin/i4b/isdntrace/isdntrace.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: isdntrace.8,v 1.9 1998/12/05 18:04:10 hm Exp $ +.\" $Id: isdntrace.8,v 1.10 1999/02/14 09:44:58 hm Exp $ .\" -.\" last edit-date: [Sat Dec 5 18:18:59 1998] +.\" last edit-date: [Sun Feb 14 10:22:24 1999] .\" .Dd October 19, 1998 .Dt isdntrace 8 diff --git a/usr.sbin/i4b/isdntrace/pcause_1tr6.c b/usr.sbin/i4b/isdntrace/pcause_1tr6.c index 42f244d..4c95ba7 100644 --- a/usr.sbin/i4b/isdntrace/pcause_1tr6.c +++ b/usr.sbin/i4b/isdntrace/pcause_1tr6.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * printing cause values * --------------------- * - * $Id: pcause_1tr6.c,v 1.4 1998/12/23 10:03:55 hm Exp $ + * $Id: pcause_1tr6.c,v 1.5 1999/02/14 09:44:58 hm Exp $ * - * last edit-date: [Wed Dec 23 10:57:11 1998] + * last edit-date: [Sun Feb 14 10:22:30 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdntrace/pcause_1tr6.h b/usr.sbin/i4b/isdntrace/pcause_1tr6.h index f327cc7..2702f57 100644 --- a/usr.sbin/i4b/isdntrace/pcause_1tr6.h +++ b/usr.sbin/i4b/isdntrace/pcause_1tr6.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * pcause1tr6.h - 1TR6 causes definitions * -------------------------------------- * - * $Id: pcause_1tr6.h,v 1.3 1998/12/05 18:04:13 hm Exp $ + * $Id: pcause_1tr6.h,v 1.4 1999/02/14 09:44:58 hm Exp $ * - * last edit-date: [Sat Dec 5 18:19:39 1998] + * last edit-date: [Sun Feb 14 10:22:36 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdntrace/pcause_q850.c b/usr.sbin/i4b/isdntrace/pcause_q850.c index 1c98388..4d5f02d 100644 --- a/usr.sbin/i4b/isdntrace/pcause_q850.c +++ b/usr.sbin/i4b/isdntrace/pcause_q850.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * printing cause values * --------------------- * - * $Id: pcause_q850.c,v 1.4 1998/12/23 10:03:55 hm Exp $ + * $Id: pcause_q850.c,v 1.5 1999/02/14 09:44:58 hm Exp $ * - * last edit-date: [Wed Dec 23 10:57:36 1998] + * last edit-date: [Sun Feb 14 10:22:42 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdntrace/pcause_q850.h b/usr.sbin/i4b/isdntrace/pcause_q850.h index a6b947f..aff6199 100644 --- a/usr.sbin/i4b/isdntrace/pcause_q850.h +++ b/usr.sbin/i4b/isdntrace/pcause_q850.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * pcauseq850.h - Q.850 causes definitions * --------------------------------------- * - * $Id: pcause_q850.h,v 1.3 1998/12/05 18:04:18 hm Exp $ + * $Id: pcause_q850.h,v 1.4 1999/02/14 09:44:58 hm Exp $ * - * last edit-date: [Sat Dec 5 18:20:05 1998] + * last edit-date: [Sun Feb 14 10:22:48 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdntrace/q921.c b/usr.sbin/i4b/isdntrace/q921.c index df007a4..294e093 100644 --- a/usr.sbin/i4b/isdntrace/q921.c +++ b/usr.sbin/i4b/isdntrace/q921.c @@ -30,7 +30,7 @@ * q.921.c - print Q.921 traces * ---------------------------- * - * $Id: q921.c,v 1.2 1998/04/16 15:27:02 hm Exp $ + * $Id: q921.c,v 1.3 1999/02/14 09:44:58 hm Exp $ * * last edit-date: [Thu Apr 16 15:38:34 1998] * diff --git a/usr.sbin/i4b/isdntrace/q931.c b/usr.sbin/i4b/isdntrace/q931.c index 3cc2a38..40f7fc3 100644 --- a/usr.sbin/i4b/isdntrace/q931.c +++ b/usr.sbin/i4b/isdntrace/q931.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * q931.c - print Q.931 traces * --------------------------- * - * $Id: q931.c,v 1.4 1998/12/05 18:04:19 hm Exp $ + * $Id: q931.c,v 1.5 1999/02/14 09:44:58 hm Exp $ * - * last edit-date: [Sat Dec 5 18:20:31 1998] + * last edit-date: [Sun Feb 14 10:23:03 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdntrace/q931_util.c b/usr.sbin/i4b/isdntrace/q931_util.c index 1b2ab09..827b7fb 100644 --- a/usr.sbin/i4b/isdntrace/q931_util.c +++ b/usr.sbin/i4b/isdntrace/q931_util.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * q931_util.c - utility functions to print Q.931 traces * ----------------------------------------------------- * - * $Id: q931_util.c,v 1.4 1998/12/05 18:04:21 hm Exp $ + * $Id: q931_util.c,v 1.5 1999/02/14 09:44:58 hm Exp $ * - * last edit-date: [Sat Dec 5 18:20:43 1998] + * last edit-date: [Sun Feb 14 10:23:10 1999] * *---------------------------------------------------------------------------*/ diff --git a/usr.sbin/i4b/isdntrace/q932_fac.c b/usr.sbin/i4b/isdntrace/q932_fac.c index ba3f59d..cedd8be 100644 --- a/usr.sbin/i4b/isdntrace/q932_fac.c +++ b/usr.sbin/i4b/isdntrace/q932_fac.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * q932_fac.c - decode Q.932 facilities * ------------------------------------ * - * $Id: q932_fac.c,v 1.4 1998/12/05 18:04:22 hm Exp $ + * $Id: q932_fac.c,v 1.5 1999/02/14 09:44:58 hm Exp $ * - * last edit-date: [Sat Dec 5 18:20:58 1998] + * last edit-date: [Sun Feb 14 10:23:16 1999] * *--------------------------------------------------------------------------- * diff --git a/usr.sbin/i4b/isdntrace/q932_fac.h b/usr.sbin/i4b/isdntrace/q932_fac.h index feae448..4d13107 100644 --- a/usr.sbin/i4b/isdntrace/q932_fac.h +++ b/usr.sbin/i4b/isdntrace/q932_fac.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * q932_fac.h - facility header file * --------------------------------- * - * $Id: q932_fac.h,v 1.4 1998/12/05 18:04:24 hm Exp $ + * $Id: q932_fac.h,v 1.5 1999/02/14 09:44:58 hm Exp $ * - * last edit-date: [Sat Dec 5 18:21:17 1998] + * last edit-date: [Sun Feb 14 10:23:22 1999] * *--------------------------------------------------------------------------- * diff --git a/usr.sbin/i4b/isdntrace/trace.c b/usr.sbin/i4b/isdntrace/trace.c index a9dde80..77a9523 100644 --- a/usr.sbin/i4b/isdntrace/trace.c +++ b/usr.sbin/i4b/isdntrace/trace.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1996, 1999 Hellmuth Michaelis. All rights reserved. * * Copyright (c) 1996 Gary Jennejohn. All rights reserved. * @@ -35,9 +35,9 @@ * trace.c - print traces of D (B) channel activity for isdn4bsd * ------------------------------------------------------------- * - * $Id: trace.c,v 1.10 1998/10/19 12:32:21 hm Exp $ + * $Id: trace.c,v 1.11 1999/02/14 09:44:58 hm Exp $ * - * last edit-date: [Mon Oct 19 14:30:58 1998] + * last edit-date: [Sun Feb 14 10:23:28 1999] * * -hm rewriting for isic and new trace format * -hm new option -f, use automatic name for -o diff --git a/usr.sbin/i4b/isdntrace/trace.h b/usr.sbin/i4b/isdntrace/trace.h index e4c5b5a..3f00bde 100644 --- a/usr.sbin/i4b/isdntrace/trace.h +++ b/usr.sbin/i4b/isdntrace/trace.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 1998 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1996, 1999 Hellmuth Michaelis. All rights reserved. * * Copyright (c) 1996 Gary Jennejohn. All rights reserved. * @@ -35,9 +35,9 @@ * trace.h - header file for isdn trace * ------------------------------------ * - * $Id: trace.h,v 1.7 1998/10/19 12:32:23 hm Exp $ + * $Id: trace.h,v 1.8 1999/02/14 09:44:58 hm Exp $ * - * last edit-date: [Mon Oct 19 14:27:21 1998] + * last edit-date: [Sun Feb 14 10:23:35 1999] * * -hm splitting * -hm new filenames diff --git a/usr.sbin/i4b/man/i4b.4 b/usr.sbin/i4b/man/i4b.4 index f285c08..09288bc 100644 --- a/usr.sbin/i4b/man/i4b.4 +++ b/usr.sbin/i4b/man/i4b.4 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: i4b.4,v 1.6 1998/12/05 18:06:03 hm Exp $ +.\" $Id: i4b.4,v 1.7 1999/02/14 09:45:02 hm Exp $ .\" -.\" last edit-date: [Sat Dec 5 18:38:11 1998] +.\" last edit-date: [Sun Feb 14 10:36:28 1999] .\" .Dd February 3, 1998 .Dt i4b 4 diff --git a/usr.sbin/i4b/man/i4bctl.4 b/usr.sbin/i4b/man/i4bctl.4 index fa5fccd..97ecba0 100644 --- a/usr.sbin/i4b/man/i4bctl.4 +++ b/usr.sbin/i4b/man/i4bctl.4 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: i4bctl.4,v 1.4 1998/12/05 18:06:04 hm Exp $ +.\" $Id: i4bctl.4,v 1.5 1999/02/14 09:45:02 hm Exp $ .\" -.\" last edit-date: [Sat Dec 5 18:38:22 1998] +.\" last edit-date: [Sun Feb 14 10:36:34 1999] .\" .Dd February 3, 1998 .Dt i4bctl 4 diff --git a/usr.sbin/i4b/man/i4bipr.4 b/usr.sbin/i4b/man/i4bipr.4 index f4cdeac..75a60bb 100644 --- a/usr.sbin/i4b/man/i4bipr.4 +++ b/usr.sbin/i4b/man/i4bipr.4 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: i4bipr.4,v 1.8 1998/12/05 18:06:06 hm Exp $ +.\" $Id: i4bipr.4,v 1.9 1999/02/14 09:45:02 hm Exp $ .\" -.\" last edit-date: [Sat Dec 5 18:38:34 1998] +.\" last edit-date: [Sun Feb 14 10:36:40 1999] .\" .Dd July 6, 1998 .Dt i4bipr 4 diff --git a/usr.sbin/i4b/man/i4bisppp.4 b/usr.sbin/i4b/man/i4bisppp.4 index ce65b82..5c690fc 100644 --- a/usr.sbin/i4b/man/i4bisppp.4 +++ b/usr.sbin/i4b/man/i4bisppp.4 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: i4bisppp.4,v 1.9 1998/12/22 19:16:57 hm Exp $ +.\" $Id: i4bisppp.4,v 1.10 1999/02/14 09:45:02 hm Exp $ .\" -.\" last edit-date: [Tue Dec 22 20:15:08 1998] +.\" last edit-date: [Sun Feb 14 10:36:45 1999] .\" .Dd December 22, 1998 .Dt i4bisppp 4 diff --git a/usr.sbin/i4b/man/i4bq921.4 b/usr.sbin/i4b/man/i4bq921.4 index bb5bcfc..b39c4f1 100644 --- a/usr.sbin/i4b/man/i4bq921.4 +++ b/usr.sbin/i4b/man/i4bq921.4 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: i4bq921.4,v 1.5 1998/12/05 18:06:08 hm Exp $ +.\" $Id: i4bq921.4,v 1.6 1999/02/14 09:45:02 hm Exp $ .\" -.\" last edit-date: [Sat Dec 5 18:38:57 1998] +.\" last edit-date: [Sun Feb 14 10:36:51 1999] .\" .Dd February 3, 1998 .Dt i4bq921 4 diff --git a/usr.sbin/i4b/man/i4bq931.4 b/usr.sbin/i4b/man/i4bq931.4 index 7c8d155..f34f600 100644 --- a/usr.sbin/i4b/man/i4bq931.4 +++ b/usr.sbin/i4b/man/i4bq931.4 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: i4bq931.4,v 1.5 1998/12/05 18:06:10 hm Exp $ +.\" $Id: i4bq931.4,v 1.6 1999/02/14 09:45:02 hm Exp $ .\" -.\" last edit-date: [Sat Dec 5 18:39:08 1998] +.\" last edit-date: [Sun Feb 14 10:36:57 1999] .\" .Dd February 3, 1998 .Dt i4bq931 4 diff --git a/usr.sbin/i4b/man/i4brbch.4 b/usr.sbin/i4b/man/i4brbch.4 index b7ee3df..1724727 100644 --- a/usr.sbin/i4b/man/i4brbch.4 +++ b/usr.sbin/i4b/man/i4brbch.4 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: i4brbch.4,v 1.5 1998/12/05 18:06:11 hm Exp $ +.\" $Id: i4brbch.4,v 1.6 1999/02/14 09:45:02 hm Exp $ .\" -.\" last edit-date: [Sat Dec 5 18:39:19 1998] +.\" last edit-date: [Sun Feb 14 10:37:03 1999] .\" .Dd February 3, 1998 .Dt i4brbch 4 diff --git a/usr.sbin/i4b/man/i4btel.4 b/usr.sbin/i4b/man/i4btel.4 index e5f6252..54518aa 100644 --- a/usr.sbin/i4b/man/i4btel.4 +++ b/usr.sbin/i4b/man/i4btel.4 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: i4btel.4,v 1.5 1998/12/05 18:06:12 hm Exp $ +.\" $Id: i4btel.4,v 1.6 1999/02/14 09:45:02 hm Exp $ .\" -.\" last edit-date: [Sat Dec 5 18:39:31 1998] +.\" last edit-date: [Sun Feb 14 10:37:09 1999] .\" .Dd February 3, 1998 .Dt i4btel 4 diff --git a/usr.sbin/i4b/man/i4btrc.4 b/usr.sbin/i4b/man/i4btrc.4 index 60b88ed..f41a882 100644 --- a/usr.sbin/i4b/man/i4btrc.4 +++ b/usr.sbin/i4b/man/i4btrc.4 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: i4btrc.4,v 1.5 1998/12/05 18:06:13 hm Exp $ +.\" $Id: i4btrc.4,v 1.6 1999/02/14 09:45:02 hm Exp $ .\" -.\" last edit-date: [Sat Dec 5 18:39:42 1998] +.\" last edit-date: [Sun Feb 14 10:37:15 1999] .\" .Dd February 3, 1998 .Dt i4btrc 4 diff --git a/usr.sbin/i4b/man/isic.4 b/usr.sbin/i4b/man/isic.4 index 0ba54d6..6fa565e 100644 --- a/usr.sbin/i4b/man/isic.4 +++ b/usr.sbin/i4b/man/isic.4 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. +.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: isic.4,v 1.14 1998/12/22 19:12:13 hm Exp $ +.\" $Id: isic.4,v 1.16 1999/02/14 09:45:02 hm Exp $ .\" -.\" last edit-date: [Tue Dec 22 20:08:06 1998] +.\" last edit-date: [Sun Feb 14 10:37:21 1999] .\" .Dd December 22, 1998 .Dt isic 4 @@ -98,7 +98,6 @@ To be able to use PnP cards under FreeBSD, you have to add to you kernel config file. More, it is recommended to add .Pp .Cd options \&"USERCONFIG\&" -.Cd options \&"USERCONFIG_BOOT\&" .Pp to your kernel config file to be able to adjust your PnP configuration in case of trouble. |
