github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-06 04:52:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fixed device index use for BLE module (fixes #994)

Browse source
This commit is contained in:
evilsocket 2024-08-09 18:00:08 +02:00
parent 93de427f9a
commit 76e136a18e
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/ble/ble_options_darwin.go
View file

@ -4,8 +4,10 @@ import (
"github.com/bettercap/gatt"
)
var defaultBLEClientOptions = []gatt.Option{
gatt.MacDeviceRole(gatt.CentralManager),
func getClientOptions(deviceID int) []gatt.Option {
return []gatt.Option{
gatt.MacDeviceRole(gatt.CentralManager),
}
}
/*

8
modules/ble/ble_options_linux.go
View file

@ -5,9 +5,11 @@ import (
// "github.com/bettercap/gatt/linux/cmd"
)
var defaultBLEClientOptions = []gatt.Option{
gatt.LnxMaxConnections(255),
gatt.LnxDeviceID(-1, true),
func getClientOptions(deviceID int) []gatt.Option {
return []gatt.Option{
gatt.LnxMaxConnections(255),
gatt.LnxDeviceID(deviceID, true),
}
}
/*

3
modules/ble/ble_recon.go
View file

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows
package ble
@ -166,7 +167,7 @@ func (mod *BLERecon) Configure() (err error) {
golog.SetFlags(0)
golog.SetOutput(dummyWriter{mod})
if mod.gattDevice, err = gatt.NewDevice(defaultBLEClientOptions...); err != nil {
if mod.gattDevice, err = gatt.NewDevice(getClientOptions(mod.deviceId)...); err != nil {
mod.Debug("error while creating new gatt device: %v", err)
return err
}