PERFORCE change 30960 for review
Peter Wemm
peter at FreeBSD.org
Sun May 11 14:56:12 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=30960
Change 30960 by peter at peter_daintree on 2003/05/11 14:55:18
IFC @30959
Affected files ...
.. //depot/projects/hammer/crypto/telnet/telnet/commands.c#6 integrate
.. //depot/projects/hammer/crypto/telnet/telnet/externs.h#2 integrate
.. //depot/projects/hammer/crypto/telnet/telnet/main.c#4 integrate
.. //depot/projects/hammer/crypto/telnet/telnet/telnet.c#4 integrate
.. //depot/projects/hammer/crypto/telnet/telnetd/telnetd.c#5 integrate
.. //depot/projects/hammer/kerberos5/include/config.h#5 integrate
.. //depot/projects/hammer/kerberos5/usr.bin/kadmin/Makefile#2 integrate
.. //depot/projects/hammer/kerberos5/usr.sbin/ktutil/Makefile#3 integrate
.. //depot/projects/hammer/libexec/Makefile#14 integrate
.. //depot/projects/hammer/libexec/telnetd/global.c#2 integrate
.. //depot/projects/hammer/libexec/telnetd/slc.c#2 integrate
.. //depot/projects/hammer/libexec/telnetd/state.c#3 integrate
.. //depot/projects/hammer/libexec/telnetd/sys_term.c#2 integrate
.. //depot/projects/hammer/libexec/telnetd/telnetd.c#4 integrate
.. //depot/projects/hammer/libexec/telnetd/termstat.c#2 integrate
.. //depot/projects/hammer/libexec/telnetd/utility.c#2 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#17 integrate
.. //depot/projects/hammer/release/i386/drivers.conf#9 integrate
.. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.8#5 integrate
.. //depot/projects/hammer/sbin/newfs/mkfs.c#8 integrate
.. //depot/projects/hammer/share/examples/netgraph/bluetooth/rc.bluetooth#1 branch
.. //depot/projects/hammer/share/man/man4/Makefile#12 integrate
.. //depot/projects/hammer/share/man/man4/ng_bluetooth.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ng_bt3c.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ng_btsocket.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ng_h4.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ng_hci.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ng_l2cap.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ng_ubt.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ubtbcmfw.4#1 branch
.. //depot/projects/hammer/sys/conf/Makefile.amd64#9 integrate
.. //depot/projects/hammer/sys/conf/files#19 integrate
.. //depot/projects/hammer/sys/conf/majors#10 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#9 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.h#7 integrate
.. //depot/projects/hammer/sys/dev/firewire/firewire.c#11 integrate
.. //depot/projects/hammer/sys/dev/ips/ips.c#1 branch
.. //depot/projects/hammer/sys/dev/ips/ips.h#1 branch
.. //depot/projects/hammer/sys/dev/ips/ips_commands.c#1 branch
.. //depot/projects/hammer/sys/dev/ips/ips_disk.c#1 branch
.. //depot/projects/hammer/sys/dev/ips/ips_disk.h#1 branch
.. //depot/projects/hammer/sys/dev/ips/ips_ioctl.c#1 branch
.. //depot/projects/hammer/sys/dev/ips/ips_ioctl.h#1 branch
.. //depot/projects/hammer/sys/dev/ips/ips_pci.c#1 branch
.. //depot/projects/hammer/sys/i386/conf/GENERIC#10 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#14 integrate
.. //depot/projects/hammer/sys/kern/subr_mbuf.c#9 integrate
.. //depot/projects/hammer/sys/modules/Makefile#16 integrate
.. //depot/projects/hammer/sys/modules/ips/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/bluetooth/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/bt3c/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/h4/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/hci/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/l2cap/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/socket/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/ubt/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/common/ng_bluetooth.c#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#3 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/TODO#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#3 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/TODO#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/TODO#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_cmds.c#3 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_cmds.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#3 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_evnt.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_misc.c#3 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_misc.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_prse.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#3 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_var.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_bluetooth.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_bt3c.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_h4.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_hci.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_l2cap.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_ubt.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/TODO#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h#3 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#3 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#3 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#3 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/TODO#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#4 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#1 branch
.. //depot/projects/hammer/usr.bin/bluetooth/Makefile#2 integrate
.. //depot/projects/hammer/usr.bin/bluetooth/btsockstat/Makefile#2 integrate
.. //depot/projects/hammer/usr.bin/bluetooth/btsockstat/btsockstat.1#3 integrate
.. //depot/projects/hammer/usr.bin/bluetooth/btsockstat/btsockstat.c#2 integrate
.. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/Makefile#1 branch
.. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#1 branch
.. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#1 branch
.. //depot/projects/hammer/usr.bin/telnet/commands.c#5 integrate
.. //depot/projects/hammer/usr.bin/telnet/externs.h#2 integrate
.. //depot/projects/hammer/usr.bin/telnet/main.c#3 integrate
.. //depot/projects/hammer/usr.bin/telnet/network.c#3 integrate
.. //depot/projects/hammer/usr.bin/telnet/ring.c#2 integrate
.. //depot/projects/hammer/usr.bin/telnet/sys_bsd.c#3 integrate
.. //depot/projects/hammer/usr.bin/telnet/telnet.c#5 integrate
.. //depot/projects/hammer/usr.bin/telnet/terminal.c#3 integrate
.. //depot/projects/hammer/usr.bin/telnet/utilities.c#3 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/bcmfw/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/bcmfw/README#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/bcmfw/bcmfw.8#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/bcmfw/bcmfw.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/bt3cfw/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/bt3cfw/bt3cfw.8#3 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/bt3cfw/bt3cfw.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/hccontrol.8#3 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/hccontrol.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/hccontrol.h#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/info.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/link_control.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/link_policy.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/node.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/send_recv.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/status.c#3 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/util.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/hcsecd.8#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/hcsecd.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/hcsecd.conf#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/hcsecd.h#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/lexer.l#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/parser.y#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hcseriald/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/hcseriald/hcseriald.8#3 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/hcseriald/hcseriald.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/l2control/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/l2control/l2cap.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/l2control/l2control.8#3 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/l2control/l2control.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/l2control/l2control.h#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/l2ping/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/l2ping/l2ping.8#3 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/l2ping/l2ping.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/rfcomm_pppd/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#1 branch
.. //depot/projects/hammer/usr.sbin/sysinstall/devices.c#6 integrate
Differences ...
==== //depot/projects/hammer/crypto/telnet/telnet/commands.c#6 (text+ko) ====
@@ -37,7 +37,7 @@
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/crypto/telnet/telnet/commands.c,v 1.30 2003/05/04 02:54:48 obrien Exp $");
+__FBSDID("$FreeBSD: src/crypto/telnet/telnet/commands.c,v 1.31 2003/05/11 18:17:00 markm Exp $");
#include <sys/param.h>
#include <sys/un.h>
@@ -532,11 +532,11 @@
{
#ifndef NOT43
if (net > 0 &&
- (SetSockOpt(net, SOL_SOCKET, SO_DEBUG, debug)) < 0) {
+ (SetSockOpt(net, SOL_SOCKET, SO_DEBUG, telnet_debug)) < 0) {
perror("setsockopt (SO_DEBUG)");
}
#else /* NOT43 */
- if (debug) {
+ if (telnet_debug) {
if (net > 0 && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0)
perror("setsockopt (SO_DEBUG)");
} else
@@ -741,7 +741,7 @@
{ "debug",
"debugging",
(int (*)(int))togdebug,
- &debug,
+ &telnet_debug,
"turn on socket level debugging" },
{ "netdata",
"printing of hexadecimal network data (debugging)",
@@ -2404,7 +2404,7 @@
}
#endif /* defined(IPPROTO_IP) && defined(IP_TOS) */
- if (debug && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0) {
+ if (telnet_debug && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0) {
perror("setsockopt (SO_DEBUG)");
}
==== //depot/projects/hammer/crypto/telnet/telnet/externs.h#2 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)externs.h 8.3 (Berkeley) 5/30/95
- * $FreeBSD: src/crypto/telnet/telnet/externs.h,v 1.9 2001/11/30 22:28:07 markm Exp $
+ * $FreeBSD: src/crypto/telnet/telnet/externs.h,v 1.10 2003/05/11 18:17:00 markm Exp $
*/
#ifndef BSD
@@ -127,7 +127,7 @@
netdata, /* Print out network data flow */
prettydump, /* Print "netdata" output in user readable format */
termdata, /* Print out terminal data flow */
- debug, /* Debug level */
+ telnet_debug, /* Debug level */
doaddrlookup, /* do a reverse lookup? */
clienteof; /* Client received EOF */
==== //depot/projects/hammer/crypto/telnet/telnet/main.c#4 (text+ko) ====
@@ -37,7 +37,7 @@
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/crypto/telnet/telnet/main.c,v 1.17 2003/05/04 02:54:48 obrien Exp $");
+__FBSDID("$FreeBSD: src/crypto/telnet/telnet/main.c,v 1.18 2003/05/11 18:17:00 markm Exp $");
#include <sys/types.h>
#include <sys/socket.h>
@@ -213,7 +213,7 @@
skiprc = 1;
break;
case 'd':
- debug = 1;
+ telnet_debug = 1;
break;
case 'e':
set_escape_char(optarg);
==== //depot/projects/hammer/crypto/telnet/telnet/telnet.c#4 (text+ko) ====
@@ -37,7 +37,7 @@
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/crypto/telnet/telnet/telnet.c,v 1.13 2003/05/04 02:54:48 obrien Exp $");
+__FBSDID("$FreeBSD: src/crypto/telnet/telnet/telnet.c,v 1.14 2003/05/11 18:17:00 markm Exp $");
#include <sys/types.h>
@@ -95,7 +95,7 @@
connected,
showoptions,
ISend, /* trying to send network data in */
- debug = 0,
+ telnet_debug = 0,
crmod,
netdata, /* Print out network data flow */
crlf, /* Should '\r' be mapped to <CR><LF> (or <CR><NUL>)? */
==== //depot/projects/hammer/crypto/telnet/telnetd/telnetd.c#5 (text+ko) ====
@@ -37,7 +37,7 @@
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/telnetd.c,v 1.22 2003/05/04 02:54:49 obrien Exp $");
+__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/telnetd.c,v 1.23 2003/05/11 18:17:00 markm Exp $");
#include "telnetd.h"
#include "pathnames.h"
@@ -78,7 +78,7 @@
int hostinfo = 1; /* do we print login banner? */
-int debug = 0;
+static int debug = 0;
int keepalive = 1;
const char *altlogin;
==== //depot/projects/hammer/kerberos5/include/config.h#5 (text+ko) ====
@@ -1,7 +1,7 @@
/* include/config.h. Generated automatically by configure. */
/* include/config.h.in. Generated automatically from configure.in by autoheader. */
-/* $FreeBSD: src/kerberos5/include/config.h,v 1.11 2002/11/24 21:00:51 nectar Exp $ */
+/* $FreeBSD: src/kerberos5/include/config.h,v 1.12 2003/05/11 18:49:28 markm Exp $ */
#include <osreldate.h>
@@ -1118,9 +1118,6 @@
/* Define if you are running IRIX 4. */
/* #undef IRIX4 */
-/* Define if you have the krb4 package. */
-/* #undef KRB4 */
-
/* Enable Kerberos 5 support in applications. */
#define KRB5 1
@@ -1328,13 +1325,7 @@
/* Define to `int' if <sys/types.h> doesn't define. */
/* #undef uid_t */
-#if defined(HAVE_FOUR_VALUED_KRB_PUT_INT) || !defined(KRB4)
#define KRB_PUT_INT(F, T, L, S) krb_put_int((F), (T), (L), (S))
-#else
-#define KRB_PUT_INT(F, T, L, S) krb_put_int((F), (T), (S))
-#endif
-
-
#if defined(ENCRYPTION) && !defined(AUTHENTICATION)
#define AUTHENTICATION 1
==== //depot/projects/hammer/kerberos5/usr.bin/kadmin/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/usr.bin/kadmin/Makefile,v 1.11 2003/03/09 21:56:54 markm Exp $
+# $FreeBSD: src/kerberos5/usr.bin/kadmin/Makefile,v 1.12 2003/05/11 18:49:29 markm Exp $
PROG= kadmin
SRCS= \
@@ -33,17 +33,17 @@
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
-LDADD= -L${KRB5OBJDIR} -lkrb5 \
+LDADD= -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
+ -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
- -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-L${HDBOBJDIR} -lhdb \
-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err \
- -L${SLOBJDIR} -lsl -lreadline
+ -L${SLOBJDIR} -lsl -lreadline -lcurses
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \
${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
- ${LIBSL} ${LIBREADLINE}
+ ${LIBSL} ${LIBREADLINE} ${LIBCURSES}
MAN= kadmin.8
.include <bsd.prog.mk>
==== //depot/projects/hammer/kerberos5/usr.sbin/ktutil/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/usr.sbin/ktutil/Makefile,v 1.11 2003/03/09 21:56:55 markm Exp $
+# $FreeBSD: src/kerberos5/usr.sbin/ktutil/Makefile,v 1.12 2003/05/11 18:49:29 markm Exp $
PROG= ktutil
SRCS= \
@@ -25,15 +25,16 @@
-I${KRB5DIR}/admin \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
-LDADD= -L${KRB5OBJDIR} -lkrb5 \
+LDADD= -L${KADM5COBJDIR} -lkadm5clnt \
+ -L${KRB5OBJDIR} -lkrb5 \
-L${ROKENOBJDIR} -lroken \
-L${VERSOBJDIR} -lvers \
-L${SLOBJDIR} -lsl -L${ASN1OBJDIR} -lasn1 \
- -L${KADM5COBJDIR} -lkadm5clnt \
- -lcrypto -lcrypt -lcom_err -lreadline
+ -lcrypto -lcrypt -lcom_err -lreadline -lcurses
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \
${LIBSL} ${LIBASN1} ${LIBKADM5CLNT} \
- ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE}
+ ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE} \
+ ${LIBCURSES}
MAN= ktutil.8
.include <bsd.prog.mk>
==== //depot/projects/hammer/libexec/Makefile#14 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/libexec/Makefile,v 1.59 2003/05/08 06:37:12 peter Exp $
+# $FreeBSD: src/libexec/Makefile,v 1.60 2003/05/11 18:48:29 markm Exp $
# Present but disabled: kpasswdd
SUBDIR= atrun \
==== //depot/projects/hammer/libexec/telnetd/global.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
+#if 0
#ifndef lint
-#if 0
static const char sccsid[] = "@(#)global.c 8.1 (Berkeley) 6/4/93";
+#endif /* not lint */
#endif
-static const char rcsid[] =
- "$FreeBSD: src/libexec/telnetd/global.c,v 1.4 2001/08/20 12:12:27 markm Exp $";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/libexec/telnetd/global.c,v 1.5 2003/05/11 18:27:49 markm Exp $");
/*
* Allocate global variables. We do this
==== //depot/projects/hammer/libexec/telnetd/slc.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/libexec/telnetd/slc.c,v 1.13 2001/11/30 22:03:20 markm Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)slc.c 8.2 (Berkeley) 5/30/95";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/libexec/telnetd/slc.c,v 1.14 2003/05/11 18:27:49 markm Exp $");
#include "telnetd.h"
==== //depot/projects/hammer/libexec/telnetd/state.c#3 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/libexec/telnetd/state.c,v 1.18 2002/08/25 13:07:55 charnier Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)state.c 8.5 (Berkeley) 5/30/95";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/libexec/telnetd/state.c,v 1.19 2003/05/11 18:27:49 markm Exp $");
#include <stdarg.h>
#include "telnetd.h"
==== //depot/projects/hammer/libexec/telnetd/sys_term.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/libexec/telnetd/sys_term.c,v 1.38 2002/05/27 08:10:24 jmallett Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)sys_term.c 8.4+1 (Berkeley) 5/30/95";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/libexec/telnetd/sys_term.c,v 1.39 2003/05/11 18:27:49 markm Exp $");
#include <sys/types.h>
#include <sys/tty.h>
==== //depot/projects/hammer/libexec/telnetd/telnetd.c#4 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/libexec/telnetd/telnetd.c,v 1.33 2001/11/30 22:37:28 markm Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)telnetd.c 8.4 (Berkeley) 5/30/95";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/libexec/telnetd/telnetd.c,v 1.34 2003/05/11 18:27:49 markm Exp $");
#include "telnetd.h"
#include "pathnames.h"
@@ -71,7 +71,7 @@
int hostinfo = 1; /* do we print login banner? */
-int debug = 0;
+static int debug = 0;
int keepalive = 1;
const char *altlogin;
==== //depot/projects/hammer/libexec/telnetd/termstat.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/libexec/telnetd/termstat.c,v 1.15 2001/11/30 22:03:20 markm Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)termstat.c 8.2 (Berkeley) 5/30/95";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/libexec/telnetd/termstat.c,v 1.16 2003/05/11 18:27:49 markm Exp $");
#include "telnetd.h"
==== //depot/projects/hammer/libexec/telnetd/utility.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
+#if 0
#ifndef lint
-#if 0
static const char sccsid[] = "@(#)utility.c 8.4 (Berkeley) 5/30/95";
+#endif /* not lint */
#endif
-static const char rcsid[] =
- "$FreeBSD: src/libexec/telnetd/utility.c,v 1.18 2001/11/30 22:03:20 markm Exp $";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/libexec/telnetd/utility.c,v 1.19 2003/05/11 18:27:49 markm Exp $");
#ifdef __FreeBSD__
#include <locale.h>
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#17 (text+ko) ====
@@ -31,7 +31,7 @@
<sect1 id="support">
<sect1info>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.147 2003/05/09 23:14:02 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.148 2003/05/10 16:30:56 bmah Exp $</pubdate>
</sect1info>
<title>Supported Devices</title>
@@ -3398,7 +3398,7 @@
<para arch="i386">Genius and Mustek hand scanners</para>
<para arch="i386">GPB and Transputer drivers</para>
- <para arch="i386,pc98,alpha,ia64">VGA-compatible video cards
+ <para arch="i386,alpha,ia64">VGA-compatible video cards
(&man.vga.4; driver)
<note>
==== //depot/projects/hammer/release/i386/drivers.conf#9 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/release/i386/drivers.conf,v 1.25 2003/04/22 07:57:19 simokawa Exp $
+# $FreeBSD: src/release/i386/drivers.conf,v 1.26 2003/05/11 06:42:09 scottl Exp $
#
# drv: driver name in kernel config file
@@ -66,6 +66,7 @@
agp agp 3 video "AGP Host Bridge support"
amr amr 3 disk "AMI MegaRAID"
+ips ips 3 disk "IBM ServeRAID"
mlx mlx 3 disk "Mylex DAC-family RAID"
mly mly 3 disk "Mylex AcceleRAID/eXtremeRAID family"
trm trm 3 disk "Tekram DC395X SCSI cards"
==== //depot/projects/hammer/sbin/mount_nfs/mount_nfs.8#5 (text+ko) ====
@@ -31,7 +31,7 @@
.\"
.\" @(#)mount_nfs.8 8.3 (Berkeley) 3/29/95
.\"
-.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.37 2003/03/25 01:25:30 mdodd Exp $
+.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.38 2003/05/11 00:38:58 trhodes Exp $
.\""
.Dd March 29, 1995
.Dt MOUNT_NFS 8
@@ -134,9 +134,6 @@
Use a reserved socket port number.
This flag is obsolete, and only retained for compatibility reasons.
Reserved port numbers are used by default now.
-This is useful for mounting servers that require clients to use a
-reserved port number on the mistaken belief that this makes NFS
-more secure.
(For the rare case where the client has a trusted root account
but untrustworthy users and the network cables are in secure areas this does
help, but for normal desktop clients this does not apply.)
@@ -269,9 +266,6 @@
.It resvport
Same as
.Fl P .
-.It seqpacket
-Same as
-.Fl p .
.It soft
Same as
.Fl s .
==== //depot/projects/hammer/sbin/newfs/mkfs.c#8 (text+ko) ====
@@ -46,7 +46,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/newfs/mkfs.c,v 1.75 2003/05/03 18:41:58 obrien Exp $");
+__FBSDID("$FreeBSD: src/sbin/newfs/mkfs.c,v 1.76 2003/05/10 18:58:17 iedowse Exp $");
#include <err.h>
#include <limits.h>
@@ -849,7 +849,8 @@
{
if (Nflag)
return;
- bwrite(&disk, bno, bf, size);
+ if (bwrite(&disk, bno, bf, size) < 0)
+ err(36, "wtfs: %d bytes at sector %jd", size, (intmax_t)bno);
}
/*
==== //depot/projects/hammer/share/man/man4/Makefile#12 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.200 2003/05/03 10:16:55 akiyama Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.201 2003/05/10 21:44:37 julian Exp $
MAN= aac.4 \
acpi.4 \
@@ -232,6 +232,7 @@
txp.4 \
ubsa.4 \
ubsec.4 \
+ ubtbcmfw.4 \
ucom.4 \
udbp.4 \
udp.4 \
==== //depot/projects/hammer/share/man/man4/ng_bluetooth.4#3 (text+ko) ====
@@ -1,6 +1,8 @@
+.\" ng_bluetooth.4
+.\"
.\" Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin at yahoo.com>
.\" All rights reserved.
-.\"
+.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
@@ -9,7 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\"
+.\"
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -21,97 +23,81 @@
.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD: src/share/man/man4/ng_bluetooth.4,v 1.3 2002/12/27 12:15:33 schweikh Exp $
-.\"
+.\"
+.\" $Id: ng_bluetooth.4,v 1.2 2003/04/26 22:38:25 max Exp $
+.\" $FreeBSD: src/share/man/man4/ng_bluetooth.4,v 1.4 2003/05/10 21:44:37 julian Exp $
.Dd November 9, 2002
.Dt NG_BLUETOOTH 4
.Os
.Sh NAME
-.Nm ng_bluetooth
+.Nm bluetooth
.Nd placeholder for global Bluetooth variables
.Sh SYNOPSIS
.In sys/types.h
.In ng_bluetooth.h
.Sh DESCRIPTION
The
-.Nm
-module is a placeholder for global Bluetooth variables.
-All Bluetooth variables can be examined and changed via
+.Nm
+module is a placeholder for global Bluetooth variables. All Bluetooth
+variables can be examined and changed via
.Xr sysctl 8 .
-.Ss Bluetooth Variables
-Below is the description of default variables.
-Each Bluetooth module might add its own variables to the tree.
-.Bl -tag -width indent
-.It Va net.bluetooth.version
-A read-only integer variable that shows the current version of the
+.Sh BLUETOOTH VARIABLES
+Below is the description of default variables. Each Bluetooth module
+might add its own variables to the tree.
+.Bl -tag -width foobar
+.It net.bluetooth.version
+A read only integer variable that shows the current version of the
Bluetooth stack.
-.It Va net.bluetooth.hci.command_timeout
+.It net.bluetooth.hci.command_timeout
A read-write interger variable that controls the Host Controller Interface
-(HCI) command timeout (in seconds), i.e. how long the HCI layer will wait
+(HCI) command timeout (in seconds), i.e. how long the HCI layer will wait
for the
.Dv Command_Complete
or
.Dv Command_Status
event from a Bluetooth device.
-.It Va net.bluetooth.hci.connection_timeout
-A read-write integer variable that controls the HCI connection timeout, i.e.\&
-how long the HCI layer will wait for the
+.It net.bluetooth.hci.connection_timeout
+A read-write integer variable that controls the HCI connection timeout, i.e.
+how long the HCI layer will wait for the
.Dv Connection_Complete
-event.
-Normally this should not be required as Bluetooth devices have
-connection timeout of their own and will send event back.
-This timeout
-is required to ensure that no connection will stall in case when the HCI
-transport layer is broken.
-Be careful when changing this variable.
+event. Normaly this should not be required as Bluetooth devices have
+connection timeout of their own and will send event back. This timeout
+is required to ensure that no connection will stall in case when the HCI
+transport layer is broken. Be careful when changing this variable.
Make sure you understand what you are doing.
-.It Va net.bluetooth.hci.watchdog_timeout
-A read-write integer variable that controls the HCI connection watchdog
-timeout in seconds), i.e. how long the HCI layer should wait before
-disconnecting an inactive baseband connection.
-.Bf -emphasis
-This has not been implemented yet.
-.Ef
-.It Va net.bluetooth.hci.max_neighbor_age
+.It net.bluetooth.hci.max_neighbor_age
A read-write integer variable that controls time-to-live (in seconds) for
-entries in the HCI neighbor cache.
-Every time a Bluetooth device performs an
+entries in the HCI neighbor cache. Every time a Bluetooth device performs
+an
.Dv Inquiry
-operation, the results will be put in cache.
-Later when a Bluetooth device
-establishes a baseband connection, it will try to find the matching entry in
-the cache and use it.
-This might speed up establishment of the baseband
+operation, the results will be put in cache. Later when a Bluetooth device
+establishes a baseband connection, it will try to find the matching entry in
+the cache and use it. This might speed up establishment of the baseband
connection.
-.It Va net.bluetooth.l2cap.rtx_timeout
-A read-write integer variable that controls the Link Layer Control and
-Adaptation Protocol (L2CAP) Retransmission Timeout (RTX) (in seconds).
-Every time the L2CAP layer submits a control command, the RTX timeout is set.
-The value of the RTX timeout should be greater or equal to the value of
-the HCI connection timeout.
-Be careful when changing this variable.
-Make sure you understand what you are doing.
-.It Va net.bluetooth.l2cap.ertx_timeout
-A read-write integer variable that controls the L2CAP Extended Retransmission
-Timeout (ERTX) (in seconds).
-In some cases remote peer may respond with
+.It net.bluetooth.l2cap.rtx_timeout
+A read-write integer variable that controls the Link Layer Control and
+Adaptation Protocol (L2CAP) Retransmission Timeout (RTX) (in seconds).
+Every time the L2CAP layer submits a control command, the RTX timeout is set.
+The value of the RTX timeout should be greater or equal to the value of
+the HCI connection timeout. Be careful when changing this variable. Make
+sure you understand what you are doing.
+.It net.bluetooth.l2cap.ertx_timeout
+A read-write integer variable that controls the L2CAP Extended Retransmission
+Timeout (ERTX) (in seconds). In some cases remote peer may respond with
.Dv PENDING
-status to the L2CAP control command.
-In this case the L2CAP command timeout is reset to the ERTX timeout value.
-The value of the ERTX timeout should be
-greater or equal to the value of the RTX timeout.
-Be careful when changing this variable.
-Make sure you understand what you are doing.
+status to the L2CAP control command. In this case the L2CAP command timeout
+is reset to the ERTX timeout value. The value of the ERTX timeout should be
+greater or equal to the value of the RTX timeout. Be careful when changing
+this variable. Make sure you understand what you are doing.
.El
.Sh SEE ALSO
-.Xr ng_btsocket 4 ,
+.Xr sysctl 8 ,
.Xr ng_hci 4 ,
.Xr ng_l2cap 4 ,
-.Xr sysctl 8
+.Xr ng_btsocket 4
.Sh HISTORY
The
-.Nm
+.Nm
module was implemented in
.Fx 5.0 .
.Sh AUTHORS
==== //depot/projects/hammer/share/man/man4/ng_bt3c.4#3 (text+ko) ====
@@ -1,6 +1,8 @@
+.\" ng_bt3c.4
+.\"
.\" Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin at yahoo.com>
.\" All rights reserved.
-.\"
+.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
@@ -9,7 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\"
+.\"
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -21,46 +23,40 @@
.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD: src/share/man/man4/ng_bt3c.4,v 1.2 2002/12/13 10:38:42 ru Exp $
-.\"
+.\"
+.\" $Id: ng_bt3c.4,v 1.1 2002/11/24 19:37:54 max Exp $
+.\" $FreeBSD: src/share/man/man4/ng_bt3c.4,v 1.3 2003/05/10 21:44:37 julian Exp $
.Dd June 14, 2002
.Dt NG_BT3C 4
.Os
.Sh NAME
-.Nm ng_bt3c
+.Nm BTCCC
.Nd Netgraph node type that is also a 3Com Bluetooth PC card driver
.Sh SYNOPSIS
.In sys/types.h
.In ng_bt3c.h
.Sh DESCRIPTION
The
-.Nm btccc
+.Nm BTCCC
node type is both a persistent Netgraph node type and a driver for
-3Com Bluetooth PC card (3CRWB6096-HP).
-It implements a Bluetooth HCI
+3Com Bluetooth PC card (3CRWB6096-HP). It implements a Bluetooth HCI
UART transport layer as per chapter H4 of the Bluetooth Specification
-Book v1.1.
-A new node is created when the card is plugged.
+Book v1.1. A new node is created when the card is plugged.
.Pp
In order to use the card one
.Em MUST
-download firmware first.
-Due to copyright issues I will no longer provide firmware with the driver.
-The firmware can be obtained
-from the Windows driver package that can be downloaded from the 3COM web
-site at no charge.
-The firmware name is
-.Pa BT3CPCC.BIN .
-To load firmware into the card, use
+download firmware first. Due to copyright issues I will no longer
+provide firmware with the driver. The firmware can be obtained
+from the Windows driver package that can be downloaded from the 3COM web
+site at no charge. The firmware name is BT3CPCC.BIN. To load firmware
+info the card use
.Xr bt3cfw 8 .
-I am using original firmware that came with the card on CD-ROM.
+I'm using original firmware that came with the card on CD-ROM.
+.Bd -literal -offset indent
+MD5 (BT3CPCC.BIN) = 36170fda56ea9fdbf1702c966f8a97f1
+.Ed
.Pp
-.Dl "MD5 (BT3CPCC.BIN) = 36170fda56ea9fdbf1702c966f8a97f1"
-.Pp
-For
-.Pa OLDCARD
-systems the entry in
+For OLDCARD systems the entry in
.Xr pccard.conf 5
might look like this
.Bd -literal -offset indent
@@ -70,30 +66,29 @@
insert /usr/sbin/bt3cfw -n $device -f /etc/BT3CPCC.bin
.Ed
.Pp
-Do not forget to load module and
-.Dv SIGHUP
+Do not forget to load module and SIGHUP
.Xr pccardd 8 .
.Pp
The node has a single hook called
.Dv hook .
Incoming bytes received on the device are re-assembled into HCI frames
-(according to the length).
-Full HCI frames are sent out on the hook.
-HCI frames received on
+(according to the length). Full HCI frames are sent out on the hook. HCI
+frames received on
.Dv hook
-are transmitted out.
-No modification to the data is performed in either direction.
+are transmitted out. No modification to the data is performed in
+either direction.
.Sh HOOKS
This node type supports the following hooks:
-.Bl -tag -width indent
+.Pp
+.Bl -tag -width foobar
.It Dv hook
single HCI frame contained in single
-.Vt mbuf
+.Dv mbuf
structure.
.El
.Sh CONTROL MESSAGES
This node type supports the generic control messages, plus the following:
-.Bl -tag -width indent
+.Bl -tag -width foo
.It Dv NGM_BT3C_NODE_GET_STATE
Returns current receiving state for the node.
.It Dv NGM_BT3C_NODE_GET_DEBUG
@@ -102,15 +97,15 @@
This command takes an integer argument and sets current debug level
for the node.
.It Dv NGM_BT3C_NODE_GET_QLEN
-This command takes a parameter that specifies queue number and returns
+This command takes a parameter that specifies queue number and returns
current length of the queue for the node.
.It Dv NGM_BT3C_NODE_SET_QLEN
-This command takes two parameters that specify queue number and and
-maximum length of the queue and sets maximum length of the queue for
+This command takes two parameters that specify queue number and and
+maximum length of the queue and sets maximum length of the queue for
the node.
.It Dv NGM_BT3C_NODE_GET_STAT
-Returns various statistic information for the node, such as: number of
-bytes (frames) sent, number of bytes (frames) received and number of
+Returns various statistic information for the node, such as: number of
+bytes (frames) sent, number of bytes (frames) received and number of
input (output) errors.
.It Dv NGM_BT3C_NODE_RESET_STAT
Reset all statistic counters to zero.
@@ -120,22 +115,21 @@
.Sh SHUTDOWN
This node shuts down when the corresponding card is un-plugged.
.Sh BUGS
-The driver is based on information obtained from
-.An Jose Orlando Pereira Aq jop at di.uminho.pt
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list