CVS commit: [netbsd-4] src

["Liam J. Foy" <liamjfoy%netbsd.org@localhost>]

Module Name:    src
Committed By:   liamjfoy
Date:           Thu Jul 19 16:04:23 UTC 2007

Modified Files:
        src/lib/libusbhid [netbsd-4]: descr.c usbhid.3 usbhid.h
        src/share/man/man4 [netbsd-4]: bluetooth.4 bthidev.4
        src/share/man/man9 [netbsd-4]: bluetooth.9
        src/sys/dev/bluetooth [netbsd-4]: btdev.h bthidev.c btsco.c
        src/sys/netbt [netbsd-4]: bluetooth.h hci.h hci_event.c hci_link.c
            l2cap.h l2cap_lower.c l2cap_misc.c l2cap_signal.c l2cap_socket.c
            l2cap_upper.c rfcomm.h rfcomm_dlc.c rfcomm_session.c
            rfcomm_socket.c rfcomm_upper.c sco_socket.c
        src/usr.bin/rfcomm_sppd [netbsd-4]: rfcomm_sppd.1 rfcomm_sppd.c
        src/usr.sbin/btdevctl [netbsd-4]: btdevctl.8 btdevctl.c btdevctl.h db.c
            print.c sdp.c

Log Message:
Pull up following revision(s) (requested by plunky in ticket #744):
        sys/netbt/l2cap_lower.c: revision 1.6
        sys/dev/bluetooth/btdev.h: revision 1.6
        sys/netbt/sco_socket.c: revision 1.9
        sys/netbt/rfcomm_upper.c: revision 1.3
        sys/netbt/l2cap_socket.c: revision 1.7
        sys/netbt/rfcomm_upper.c: revision 1.5
        lib/libusbhid/usbhid.h: revision 1.5
        sys/netbt/rfcomm_upper.c: revision 1.6
        usr.sbin/btdevctl/btdevctl.c: revision 1.4
        usr.sbin/btdevctl/btdevctl.h: revision 1.3
        usr.sbin/btdevctl/btdevctl.8: revision 1.4
        sys/netbt/rfcomm_session.c: revision 1.5
        sys/netbt/hci.h: revision 1.10
        usr.bin/rfcomm_sppd/rfcomm_sppd.c: revision 1.6
        sys/netbt/hci_link.c: revision 1.11
        usr.bin/rfcomm_sppd/rfcomm_sppd.c: revision 1.7
        usr.bin/rfcomm_sppd/rfcomm_sppd.c: revision 1.8
        sys/dev/bluetooth/btsco.c: revision 1.14
        sys/netbt/rfcomm_session.c: revision 1.9
        usr.sbin/btdevctl/sdp.c: revision 1.2
        share/man/man9/bluetooth.9: revision 1.2
        usr.sbin/btdevctl/sdp.c: revision 1.3
        sys/dev/bluetooth/bthidev.c: revision 1.8
        sys/netbt/l2cap.h: revision 1.4
        sys/netbt/rfcomm.h: revision 1.3
        sys/netbt/l2cap.h: revision 1.5
        sys/netbt/l2cap_misc.c: revision 1.3
        share/man/man4/bluetooth.4: revision 1.5
        lib/libusbhid/usbhid.3: revision 1.11
        sys/netbt/bluetooth.h: revision 1.5
        share/man/man4/bthidev.4: revision 1.8
        sys/netbt/rfcomm_dlc.c: revision 1.3
        usr.sbin/btdevctl/print.c: revision 1.8
        sys/netbt/rfcomm_socket.c: revision 1.7
        sys/netbt/l2cap_signal.c: revision 1.4
        sys/netbt/l2cap_signal.c: revision 1.5
        sys/netbt/l2cap_signal.c: revision 1.7
        sys/netbt/hci_event.c: revision 1.6
        usr.bin/rfcomm_sppd/rfcomm_sppd.1: revision 1.5
        sys/netbt/l2cap_upper.c: revision 1.3
        sys/netbt/l2cap_lower.c: revision 1.2
        usr.sbin/btdevctl/db.c: revision 1.3
        sys/netbt/l2cap_upper.c: revision 1.6
        lib/libusbhid/descr.c: revision 1.5
        sys/netbt/l2cap_upper.c: revision 1.7
        sys/netbt/l2cap_lower.c: revision 1.4
Add 'service level' security for L2CAP and RFCOMM connections, following
the Linux (BlueZ) API.
   - L2CAP or RFCOMM connections can require the baseband radio link
   mode be any of:
       authenticated (devices are paired)
       encrypted (implies authentication)
       secured (encryption, plus generate new link key)
   - for sockets, the mode is set using setsockopt(2) and the socket
   connection will be aborted if the mode change fails.
   - mode settings will be applied during connection establishment, and
   for safety, we enter a wait state and will only proceed when the mode
   settings are successfuly set.
   - It is possible to change the mode on already open connections, but
   not possible to guarantee that data already queued (from either end)
   will not be delivered. (this is a feature, not a bug)
   - bthidev(4) and rfcomm_sppd(1) support "auth", "encrypt" and
   "secure" options
   - btdevctl(8) by default enables "auth" for HIDs, and "encrypt" for
   keyboards (which are required to support it)
   - ALSO INCLUDES OTHER MINOR FIXES


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.4.16.1 src/lib/libusbhid/descr.c
cvs rdiff -r1.10 -r1.10.10.1 src/lib/libusbhid/usbhid.3
cvs rdiff -r1.3 -r1.3.4.1 src/lib/libusbhid/usbhid.h
cvs rdiff -r1.4 -r1.4.2.1 src/share/man/man4/bluetooth.4
cvs rdiff -r1.7 -r1.7.2.1 src/share/man/man4/bthidev.4
cvs rdiff -r1.1 -r1.1.4.1 src/share/man/man9/bluetooth.9
cvs rdiff -r1.5 -r1.5.2.1 src/sys/dev/bluetooth/btdev.h
cvs rdiff -r1.7 -r1.7.2.1 src/sys/dev/bluetooth/bthidev.c
cvs rdiff -r1.11 -r1.11.2.1 src/sys/dev/bluetooth/btsco.c
cvs rdiff -r1.4 -r1.4.2.1 src/sys/netbt/bluetooth.h \
    src/sys/netbt/rfcomm_session.c
cvs rdiff -r1.7 -r1.7.2.1 src/sys/netbt/hci.h
cvs rdiff -r1.2 -r1.2.4.1 src/sys/netbt/hci_event.c
cvs rdiff -r1.8 -r1.8.2.1 src/sys/netbt/hci_link.c
cvs rdiff -r1.2 -r1.2.2.1 src/sys/netbt/l2cap.h src/sys/netbt/rfcomm.h
cvs rdiff -r1.1 -r1.1.18.1 src/sys/netbt/l2cap_lower.c \
    src/sys/netbt/l2cap_misc.c src/sys/netbt/l2cap_upper.c \
    src/sys/netbt/rfcomm_dlc.c src/sys/netbt/rfcomm_upper.c
cvs rdiff -r1.2.4.2 -r1.2.4.3 src/sys/netbt/l2cap_signal.c
cvs rdiff -r1.3 -r1.3.2.1 src/sys/netbt/l2cap_socket.c \
    src/sys/netbt/rfcomm_socket.c
cvs rdiff -r1.5 -r1.5.2.1 src/sys/netbt/sco_socket.c
cvs rdiff -r1.1.4.1 -r1.1.4.2 src/usr.bin/rfcomm_sppd/rfcomm_sppd.1
cvs rdiff -r1.1.4.2 -r1.1.4.3 src/usr.bin/rfcomm_sppd/rfcomm_sppd.c
cvs rdiff -r1.3 -r1.3.2.1 src/usr.sbin/btdevctl/btdevctl.8 \
    src/usr.sbin/btdevctl/btdevctl.c
cvs rdiff -r1.2 -r1.2.2.1 src/usr.sbin/btdevctl/btdevctl.h
cvs rdiff -r1.1 -r1.1.4.1 src/usr.sbin/btdevctl/db.c \
    src/usr.sbin/btdevctl/sdp.c
cvs rdiff -r1.7 -r1.7.2.1 src/usr.sbin/btdevctl/print.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.