From 76a537984d1963d49e73986aa8e53cacfa9427c3 Mon Sep 17 00:00:00 2001
From: evilsocket <evilsocket@gmail.com>
Date: Mon, 26 Feb 2018 19:20:45 +0100
Subject: [PATCH] misc: small fix or general refactoring i did not bother
 commenting

---
 build.sh                           | 12 +++----
 modules/events_view.go             | 44 ------------------------
 modules/events_view_ble.go         | 55 ++++++++++++++++++++++++++++++
 modules/events_view_ble_windows.go |  9 +++++
 4 files changed, 70 insertions(+), 50 deletions(-)
 create mode 100644 modules/events_view_ble.go
 create mode 100644 modules/events_view_ble_windows.go

diff --git a/build.sh b/build.sh
index c641c608..4dec91e2 100755
--- a/build.sh
+++ b/build.sh
@@ -166,12 +166,12 @@ mkdir $BUILD_FOLDER
 cd $BUILD_FOLDER
 
 # 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
-build_linux_mipsle bettercap_linux_mipsle_$VERSION
-build_linux_mips64 bettercap_linux_mips64_$VERSION
-build_linux_mips64le bettercap_linux_mips64le_$VERSION
+# build_linux_amd64 bettercap_linux_amd64_$VERSION
+# build_linux_arm7 bettercap_linux_arm7_$VERSION
+# build_linux_mips bettercap_linux_mips_$VERSION
+# build_linux_mipsle bettercap_linux_mipsle_$VERSION
+# build_linux_mips64 bettercap_linux_mips64_$VERSION
+# build_linux_mips64le bettercap_linux_mips64le_$VERSION
 build_macos_amd64 bettercap_macos_amd64_$VERSION
 build_windows_amd64 bettercap_windows_amd64_$VERSION.exe
 sha256sum * > checksums.txt
diff --git a/modules/events_view.go b/modules/events_view.go
index ce5c25ef..5a36099a 100644
--- a/modules/events_view.go
+++ b/modules/events_view.go
@@ -139,50 +139,6 @@ func (s EventsStream) viewSnifferEvent(e session.Event) {
 		misc)
 }
 
-func (s EventsStream) viewBLEEvent(e session.Event) {
-	if e.Tag == "ble.device.new" {
-		dev := e.Data.(*network.BLEDevice)
-		name := dev.Device.Name()
-		if name != "" {
-			name = " " + core.Bold(name)
-		}
-		vend := dev.Vendor
-		if vend != "" {
-			vend = fmt.Sprintf(" (%s)", core.Yellow(vend))
-		}
-
-		fmt.Printf("[%s] [%s] New BLE device%s detected as %s%s %s.\n",
-			e.Time.Format(eventTimeFormat),
-			core.Green(e.Tag),
-			name,
-			dev.Device.ID(),
-			vend,
-			core.Dim(fmt.Sprintf("%d dBm", dev.RSSI)))
-	} else if e.Tag == "ble.device.lost" {
-		dev := e.Data.(*network.BLEDevice)
-		name := dev.Device.Name()
-		if name != "" {
-			name = " " + core.Bold(name)
-		}
-		vend := dev.Vendor
-		if vend != "" {
-			vend = fmt.Sprintf(" (%s)", core.Yellow(vend))
-		}
-
-		fmt.Printf("[%s] [%s] BLE device%s %s%s lost.\n",
-			e.Time.Format(eventTimeFormat),
-			core.Green(e.Tag),
-			name,
-			dev.Device.ID(),
-			vend)
-	} else {
-		fmt.Printf("[%s] [%s] %v\n",
-			e.Time.Format(eventTimeFormat),
-			core.Green(e.Tag),
-			e.Data)
-	}
-}
-
 func (s EventsStream) viewSynScanEvent(e session.Event) {
 	se := e.Data.(SynScanEvent)
 	fmt.Printf("[%s] [%s] Found open port %d for %s\n",
diff --git a/modules/events_view_ble.go b/modules/events_view_ble.go
new file mode 100644
index 00000000..a701c2bc
--- /dev/null
+++ b/modules/events_view_ble.go
@@ -0,0 +1,55 @@
+// +build !windows
+
+package modules
+
+import (
+	"fmt"
+
+	"github.com/bettercap/bettercap/core"
+	"github.com/bettercap/bettercap/network"
+	"github.com/bettercap/bettercap/session"
+)
+
+func (s EventsStream) viewBLEEvent(e session.Event) {
+	if e.Tag == "ble.device.new" {
+		dev := e.Data.(*network.BLEDevice)
+		name := dev.Device.Name()
+		if name != "" {
+			name = " " + core.Bold(name)
+		}
+		vend := dev.Vendor
+		if vend != "" {
+			vend = fmt.Sprintf(" (%s)", core.Yellow(vend))
+		}
+
+		fmt.Printf("[%s] [%s] New BLE device%s detected as %s%s %s.\n",
+			e.Time.Format(eventTimeFormat),
+			core.Green(e.Tag),
+			name,
+			dev.Device.ID(),
+			vend,
+			core.Dim(fmt.Sprintf("%d dBm", dev.RSSI)))
+	} else if e.Tag == "ble.device.lost" {
+		dev := e.Data.(*network.BLEDevice)
+		name := dev.Device.Name()
+		if name != "" {
+			name = " " + core.Bold(name)
+		}
+		vend := dev.Vendor
+		if vend != "" {
+			vend = fmt.Sprintf(" (%s)", core.Yellow(vend))
+		}
+
+		fmt.Printf("[%s] [%s] BLE device%s %s%s lost.\n",
+			e.Time.Format(eventTimeFormat),
+			core.Green(e.Tag),
+			name,
+			dev.Device.ID(),
+			vend)
+	} else {
+		fmt.Printf("[%s] [%s] %v\n",
+			e.Time.Format(eventTimeFormat),
+			core.Green(e.Tag),
+			e.Data)
+	}
+}
diff --git a/modules/events_view_ble_windows.go b/modules/events_view_ble_windows.go
new file mode 100644
index 00000000..d5358a4a
--- /dev/null
+++ b/modules/events_view_ble_windows.go
@@ -0,0 +1,9 @@
+package modules
+
+import (
+	"github.com/bettercap/bettercap/session"
+)
+
+func (s EventsStream) viewBLEEvent(e session.Event) {
+
+}