github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-20 21:43:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: setting BLE device name once services are enumerated

Browse source
This commit is contained in:
evilsocket 2019-03-17 13:36:59 +01:00
commit d6e6746809
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/ble/ble_show_services.go
View file

@ -367,6 +367,10 @@ func (mod *BLERecon) showServices(p gatt.Peripheral, services []*gatt.Service) {
data = parseRawData(raw) data = parseRawData(raw)
} }
if ch.Name() == "Device Name" && data != "" && mod.currDevice.DeviceName == "" {
mod.currDevice.DeviceName = data
}
if multi == nil { if multi == nil {
char.Data = data char.Data = data
rows = append(rows, []string{ rows = append(rows, []string{

7
network/ble_device.go
View file

@ -28,6 +28,7 @@ type BLEService struct {
type BLEDevice struct { type BLEDevice struct {
LastSeen time.Time LastSeen time.Time
DeviceName string
Vendor string Vendor string
RSSI int RSSI int
Device gatt.Peripheral Device gatt.Peripheral
@ -62,10 +63,16 @@ func NewBLEDevice(p gatt.Peripheral, a *gatt.Advertisement, rssi int) *BLEDevice
} }
func (d *BLEDevice) Name() string { func (d *BLEDevice) Name() string {
// get the name if it's being set during services enumeration via 'Device Name'
name := d.DeviceName
if name == "" {
// get the name from the device
name := d.Device.Name() name := d.Device.Name()
if name == "" && d.Advertisement != nil { if name == "" && d.Advertisement != nil {
// get the name from the advertisement data
name = d.Advertisement.LocalName name = d.Advertisement.LocalName
} }
}
return name return name
} }