Up to [cvs.NetBSD.org] / src / usr.sbin / btdevctl
Request diff between arbitrary revisions
Keyword substitution: kv
Default branch: MAIN
the Bluetooth rc.d setup was simplified some time ago, so 'btdevctl' variable is no longer used. change wording to reflect this
Rebase to HEAD as of a few days ago.
sync with head.
for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.
this commit was splitted into small chunks to avoid
a limitation of cvs. ("Protocol error: too many arguments")
Merge riastradh-drm2 to HEAD.
sync with HEAD
Use Mt for email addresses.
resync with head
sync with head
Pull up following revision(s) (requested by plunky in ticket #1835): sys/dev/bluetooth/bthidev.c: revision 1.23 via patch sys/dev/bluetooth/bthidev.c: revision 1.24 via patch usr.sbin/btdevctl/btdevctl.8: revision 1.8 via patch sys/dev/bluetooth/btmagic.c: revision 1.4 via patch sys/dev/bluetooth/btmagic.c: revision 1.5 via patch when no link-mode is specified, explicitly set a mode of (int)0 otherwise l2cap_setmode() will fail during connection setup for bthidev.c, this fixes a problem with Microsoft Wedge Touch mouse (which may not be able to authenticate) for btmagic.c, include this fix in case somebody tries that related to PR/47286 increase some diagnostics add a comment pointing out that the link-mode may need to be changed manually, for devices which cannot authenticate for PR/47286
Pull up following revision(s) (requested by plunky in ticket #769): sys/dev/bluetooth/bthidev.c: revision 1.23 sys/dev/bluetooth/bthidev.c: revision 1.24 usr.sbin/btdevctl/btdevctl.8: revision 1.8 sys/dev/bluetooth/btmagic.c: revision 1.4 sys/dev/bluetooth/btmagic.c: revision 1.5 when no link-mode is specified, explicitly set a mode of (int)0 otherwise l2cap_setmode() will fail during connection setup for bthidev.c, this fixes a problem with Microsoft Wedge Touch mouse (which may not be able to authenticate) for btmagic.c, include this fix in case somebody tries that related to PR/47286 increase some diagnostics add a comment pointing out that the link-mode may need to be changed manually, for devices which cannot authenticate for PR/47286
whitespace ' ' -> ' '
add a comment pointing out that the link-mode may need to be changed manually, for devices which cannot authenticate for PR/47286
Sort sections, use serial comma.
add a reference in the SEE ALSO section to "The NetBSD Guide" for detailed examples of device configuration
sync with HEAD
Drop trailing whitespace, remove superfluous Pp.
Sync w/ NetBSD-4-RC_1
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
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)
Pull up following revision(s) (requested by plunky in ticket #161): sys/dev/bluetooth/btdev.h: revision 1.4 distrib/sets/lists/comp/mi: revision 1.922 usr.sbin/postinstall/postinstall: revision 1.25 sys/netbt/hci_unit.c: revision 1.3 sys/netbt/hci_ioctl.c: revision 1.4 usr.sbin/sdpd/profile.c: revision 1.2 usr.sbin/btdevctl/btdevctl.c: revision 1.2 share/man/man4/Makefile: revision 1.405 distrib/sets/lists/man/mi: revision 1.930 distrib/sets/lists/etc/mi: revision 1.176 usr.sbin/sdpd/profile.c: revision 1.3 usr.sbin/btdevctl/btdevctl.c: revision 1.3 etc/MAKEDEV.tmpl: revision 1.62 distrib/sets/lists/base/mi: revision 1.650 usr.sbin/btdevctl/btdevctl.h: revision 1.2 usr.bin/sdpquery/sdpquery.1: revision 1.4 sys/netbt/rfcomm_session.c: revision 1.2 usr.sbin/btdevctl/btdevctl.8: revision 1.3 usr.bin/sdpquery/search.c: revision 1.2 usr.sbin/sdpd/Makefile: revision 1.2 sys/dev/bluetooth/Makefile: revision 1.3 usr.sbin/btdevctl/cfg.c: file removal sys/netbt/files.netbt: revision 1.4 usr.sbin/btdevctl/sdp.c: revision 1.1 sys/dev/bluetooth/bthidev.c: revision 1.3 etc/bluetooth/Makefile: revision 1.3 sys/dev/pcmcia/files.pcmcia: revision 1.51 sys/dev/bluetooth/bthidev.c: revision 1.4 sys/dev/bluetooth/bthidev.h: revision 1.3 usr.sbin/btdevctl/dev.c: file removal sys/dev/bluetooth/files.bluetooth: revision 1.10 sys/arch/i386/conf/GENERIC: revision 1.777 share/man/man4/ubt.4: revision 1.6 share/man/man4/bthub.4: revision 1.3 sys/netbt/hci.h: revision 1.5 sys/arch/i386/conf/GENERIC_LAPTOP: revision 1.202 lib/libsdp/sdp.h: revision 1.2 usr.sbin/btdevctl/print.c: revision 1.1 share/man/man4/bthidev.4: revision 1.5 share/man/man4/btdev.4: file removal usr.sbin/btdevctl/print.c: revision 1.2 sys/arch/i386/conf/GENERIC_LAPTOP: revision 1.205 usr.sbin/btdevctl/Makefile: revision 1.2 sys/dev/usb/files.usb: revision 1.70 sys/netbt/l2cap_signal.c: revision 1.2 sys/netbt/hci_link.c: revision 1.4 sys/dev/bluetooth/bthub.c: revision 1.3 share/man/man4/btsco.4: revision 1.5 sys/netbt/hci_link.c: revision 1.5 share/man/man4/btdev.4: revision 1.4 sys/dev/bluetooth/btkbd.c: revision 1.3 sys/dev/bluetooth/btdev.c: file removal sys/netbt/hci_event.c: revision 1.2 sys/dev/bluetooth/btsco.h: revision 1.2 etc/mtree/special: revision 1.101 sys/dev/bluetooth/btsco.c: revision 1.3 sys/conf/majors: revision 1.27 usr.sbin/sdpd/hf.c: revision 1.1 sys/dev/bluetooth/btsco.c: revision 1.4 share/man/man5/rc.conf.5: revision 1.107 sys/dev/bluetooth/btdev.c: revision 1.2 etc/rc.d/btdevctl: revision 1.2 usr.sbin/btdevctl/db.c: revision 1.1 etc/rc.d/btdevctl: revision 1.3 etc/bluetooth/btdevctl.conf: revision 1.1 usr.sbin/btdevctl/hid.c: file removal sys/arch/i386/conf/GENERIC: revision 1.781 sys/dev/bluetooth/btdev.h: revision 1.3 Make btdev default count explicit Fix typo in variable name update to bluetooth device attachment: remove pseudo-device btdev(4) and inherent limitations add bthub(4) which autoconfigures at bluetooth controllers as they are enabled. bluetooth devices now attach here. btdevctl(8) and its cache is updated to handle new semantics etc/rc.d/btdevctl is updated to configure devices from a list in /etc/bluetooth/btdevctl.conf also include service name in dictionary being sent to kernel. (this is not used just yet, but it might be in the future and it will be easier if we dont have to provide code to handle its absence) clarify the CAVEAT section somewhat Add service discovery support for the Handsfree profile Replace static 'FreeBSD' string with operating system name gleaned from uname(3) Halt the callout on detach btsco.c: - sco_getopt(..., SO_SCO_MTU, ...) expects the address of a uint16_t, not an int. So change sc_mtu's type to uint16_t. - Try a little harder to ensure btsco_round_blocksize() does not return zero. Prevents a subsequent panic in audio_init_ringbuffer(). from scw@ Endian issues: hci_event.c: - Convert memo->response.clock_offset to host-endian. hci_ioctl.c: - printf format tweak (size_t) hci_link.c: - Convert memo->response.clock_offset from host-endian. - Tweak a DIAGNOSTIC message. l2cap_signal.c: - In l2cap_recv_config_req(), rp->scid is little-endian so make sure we convert from host-endian. from scw@ hci_link.c: - In hci_link_free(), do not unlink items from a LIST queue within a LIST_FOREACH() iterator. rfcomm_session.c: - In rfcomm_session_recv_mcc_nsc(), do not unlink items from a LIST queue within a LIST_FOREACH() iterator. from scw@ guard against a possible situation where the list of l2cap channels is changed when the bluetooth code is not expecting it to be. During a disconnect, we can detach the channel that is being disconnected, but its not really safe to detach any others. Print explicit 64-bit types using the format macros from int_fmtio.h. Unbreaks the build for our LP64 ports, where "long long" typically is not 64 bits.
update to bluetooth device attachment: remove pseudo-device btdev(4) and inherent limitations add bthub(4) which autoconfigures at bluetooth controllers as they are enabled. bluetooth devices now attach here. btdevctl(8) and its cache is updated to handle new semantics etc/rc.d/btdevctl is updated to configure devices from a list in /etc/bluetooth/btdevctl.conf
Pull up following revision(s) (requested by plunky in ticket #81): sys/netbt/sco_upper.c: revision 1.2 usr.sbin/btconfig/btconfig.c: revision 1.3 sys/netbt/hci_ioctl.c: revision 1.3 usr.sbin/btconfig/btconfig.8: revision 1.4 usr.sbin/btdevctl/btdevctl.8: revision 1.2 sys/netbt/files.netbt: revision 1.3 sys/netbt/bt_proto.c: revision 1.2 share/man/man4/ubt.4: revision 1.4 usr.sbin/btdevctl/cfg.c: revision 1.3 sys/netbt/hci.h: revision 1.4 share/man/man4/bluetooth.4: revision 1.2 share/man/man4/btsco.4: revision 1.4 sys/dev/bluetooth/btsco.c: revision 1.2 sys/netbt/bt_sysctl.c: revision 1.2 BluetootH SCO Audio update. Provide an ioctl to set the SCO mtu value in the controller and place limits in the SCO code such that only packets of this size may be sent. Move the mtu option from btsco(4) and btdevctl(8), to the btconfig(8) program. Remove temporary BLUETOOTH_SCO kernel option, and enable SCO socket access. Fix incoming connection handling for btsco(4) and SCO sockets. Fix documentation to reflect the new world order.
Pull up following revision(s) (requested by plunky in ticket #81): usr.sbin/postinstall/postinstall: revision 1.23 distrib/sets/lists/man/mi: revision 1.919 distrib/sets/lists/etc/mi: revision 1.174 usr.sbin/btdevctl/btdevctl.c: revision 1.1 usr.sbin/btdevctl/hid.c: revision 1.1 usr.sbin/Makefile: revision 1.217 usr.sbin/btdevctl/btdevctl.h: revision 1.1 usr.sbin/btdevctl/btdevctl.8: revision 1.1 etc/rc.d/btcontrol: file removal distrib/sets/lists/comp/mi: revision 1.910 etc/rc.d/Makefile: revision 1.61 usr.sbin/btdevctl/cfg.c: revision 1.1 usr.sbin/btdevctl/dev.c: revision 1.1 share/man/man4/btkbd.4: revision 1.2 share/man/man4/bthidev.4: revision 1.4 usr.sbin/btcontrol/hid.c: file removal usr.sbin/btdevctl/Makefile: revision 1.1 share/man/man4/btsco.4: revision 1.3 distrib/sets/lists/base/mi: revision 1.644 share/man/man4/btdev.4: revision 1.3 share/man/man4/btms.4: revision 1.2 etc/mtree/special: revision 1.100 share/man/man5/rc.conf.5: revision 1.105 usr.sbin/btcontrol/cfg.c: file removal etc/rc.d/btdevctl: revision 1.1 etc/defaults/rc.conf: revision 1.80 usr.sbin/btcontrol/btcontrol.h: file removal usr.sbin/btcontrol/btcontrol.8: file removal usr.sbin/btcontrol/dev.c: file removal usr.sbin/btcontrol/btcontrol.c: file removal usr.sbin/btcontrol/Makefile: file removal rename btcontrol(8) as btdevctl(8) to make it fit with the NetBSD naming scheme for control programs. This fixes pr 34051.
BluetootH SCO Audio update. Provide an ioctl to set the SCO mtu value in the controller and place limits in the SCO code such that only packets of this size may be sent. Move the mtu option from btsco(4) and btdevctl(8), to the btconfig(8) program. Remove temporary BLUETOOTH_SCO kernel option, and enable SCO socket access. Fix incoming connection handling for btsco(4) and SCO sockets. Fix documentation to reflect the new world order.
rename btcontrol(8) as btdevctl(8) to make it fit with the NetBSD naming scheme for control programs. This fixes pr 34051.