From 82389bb4b9dd50ff7f170ace6644c4534484d902 Mon Sep 17 00:00:00 2001 From: evilsocket Date: Mon, 26 Feb 2018 19:13:43 +0100 Subject: [PATCH] fix: fixing windows compilation --- build.sh | 2 +- network/ble_device_windows.go | 15 ++++++++++++++ network/ble_windows.go | 38 +++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 network/ble_device_windows.go create mode 100644 network/ble_windows.go diff --git a/build.sh b/build.sh index 9a3f2199..c641c608 100755 --- a/build.sh +++ b/build.sh @@ -165,7 +165,7 @@ rm -rf $BUILD_FOLDER mkdir $BUILD_FOLDER cd $BUILD_FOLDER -build_android_arm bettercap_android_arm_$VERSION +# build_android_arm bettercap_android_arm_$VERSION build_linux_amd64 bettercap_linux_amd64_$VERSION build_linux_arm7 bettercap_linux_arm7_$VERSION build_linux_mips bettercap_linux_mips_$VERSION diff --git a/network/ble_device_windows.go b/network/ble_device_windows.go new file mode 100644 index 00000000..4586f65a --- /dev/null +++ b/network/ble_device_windows.go @@ -0,0 +1,15 @@ +package network + +import ( + "time" +) + +type BLEDevice struct { + LastSeen time.Time +} + +func NewBLEDevice() *BLEDevice { + return &BLEDevice{ + LastSeen: time.Now(), + } +} diff --git a/network/ble_windows.go b/network/ble_windows.go new file mode 100644 index 00000000..51ba74be --- /dev/null +++ b/network/ble_windows.go @@ -0,0 +1,38 @@ +package network + +import ( + "encoding/json" +) + +type BLEDevNewCallback func(dev *BLEDevice) +type BLEDevLostCallback func(dev *BLEDevice) + +type BLE struct { + devices map[string]*BLEDevice + newCb BLEDevNewCallback + lostCb BLEDevLostCallback +} + +type bleJSON struct { + Devices []*BLEDevice `json:"devices"` +} + +func NewBLE(newcb BLEDevNewCallback, lostcb BLEDevLostCallback) *BLE { + return &BLE{ + devices: make(map[string]*BLEDevice), + newCb: newcb, + lostCb: lostcb, + } +} + +func (b *BLE) MarshalJSON() ([]byte, error) { + doc := bleJSON{ + Devices: make([]*BLEDevice, 0), + } + + for _, dev := range b.Devices() { + doc.Devices = append(doc.Devices, dev) + } + + return json.Marshal(doc) +}