Skip to content

fix: HCI fixes when acting as peripheral #343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 21, 2025
Merged

fix: HCI fixes when acting as peripheral #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8355713
fix: handle l2cap connection param req updates with invalid length data
deadprogram Feb 20, 2025
72f2ff0
fix: correctly handle slice of connection handles for notification up…
deadprogram Feb 20, 2025
cf0903a
modules: update to use cyw43439 package with BLE read length fix
deadprogram Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions att_hci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,12 +478,12 @@ func (a *att) sendNotification(handle uint16, data []byte) error {
b[0] = attOpHandleNotify
binary.LittleEndian.PutUint16(b[1:], handle)

for connection := range a.connections {
for _, connection := range a.connections {
if debug {
println("att.sendNotifications: sending to", connection)
}

if err := a.hci.sendAclPkt(uint16(connection), attCID, append(b[:], data...)); err != nil {
if err := a.hci.sendAclPkt(connection, attCID, append(b[:], data...)); err != nil {
return err
}
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/go-ole/go-ole v1.2.6
github.com/godbus/dbus/v5 v5.1.0
github.com/saltosystems/winrt-go v0.0.0-20240509164145-4f7860a3bd2b
github.com/soypat/cyw43439 v0.0.0-20241116210509-ae1ce0e084c5
github.com/soypat/cyw43439 v0.0.0-20250221124649-d06a11e466eb
github.com/tinygo-org/cbgo v0.0.4
golang.org/x/crypto v0.12.0
tinygo.org/x/drivers v0.28.1-0.20241028090715-76a4276b5dea
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ github.com/saltosystems/winrt-go v0.0.0-20240509164145-4f7860a3bd2b/go.mod h1:CI
github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/soypat/cyw43439 v0.0.0-20241116210509-ae1ce0e084c5 h1:arwJFX1x5zq+wUp5ADGgudhMQEXKNMQOmTh+yYgkwzw=
github.com/soypat/cyw43439 v0.0.0-20241116210509-ae1ce0e084c5/go.mod h1:1Otjk6PRhfzfcVHeWMEeku/VntFqWghUwuSQyivb2vE=
github.com/soypat/cyw43439 v0.0.0-20250221124649-d06a11e466eb h1:M4ZPCf5GqJzvvKOKM6wJTKzPJ7xgZf7WqpvS3UYXguk=
github.com/soypat/cyw43439 v0.0.0-20250221124649-d06a11e466eb/go.mod h1:1Otjk6PRhfzfcVHeWMEeku/VntFqWghUwuSQyivb2vE=
github.com/soypat/seqs v0.0.0-20240527012110-1201bab640ef h1:phH95I9wANjTYw6bSYLZDQfNvao+HqYDom8owbNa0P4=
github.com/soypat/seqs v0.0.0-20240527012110-1201bab640ef/go.mod h1:oCVCNGCHMKoBj97Zp9znLbQ1nHxpkmOY9X+UAGzOxc8=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
Expand Down
11 changes: 11 additions & 0 deletions l2cap_hci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ package bluetooth
import (
"encoding/binary"
"encoding/hex"
"errors"
)

var errInvalidPayloadLength = errors.New("bluetooth: invalid payload length")

const (
connectionParamUpdateRequest = 0x12
connectionParamUpdateResponse = 0x13
Expand All @@ -20,6 +23,10 @@ type l2capConnectionParamReqPkt struct {
}

func (l *l2capConnectionParamReqPkt) Write(buf []byte) (int, error) {
if len(buf) < 8 {
return 0, errInvalidPayloadLength
}

l.minInterval = binary.LittleEndian.Uint16(buf[0:])
l.maxInterval = binary.LittleEndian.Uint16(buf[2:])
l.latency = binary.LittleEndian.Uint16(buf[4:])
Expand All @@ -29,6 +36,10 @@ func (l *l2capConnectionParamReqPkt) Write(buf []byte) (int, error) {
}

func (l *l2capConnectionParamReqPkt) Read(p []byte) (int, error) {
if len(p) < 8 {
return 0, errInvalidPayloadLength
}

binary.LittleEndian.PutUint16(p[0:], l.minInterval)
binary.LittleEndian.PutUint16(p[2:], l.maxInterval)
binary.LittleEndian.PutUint16(p[4:], l.latency)
Expand Down
Loading