From 9e9d8982a7c065cd0f213ff91fdb6cc95c7f476d Mon Sep 17 00:00:00 2001
From: freqy <freqyxin@gmail.com>
Date: Fri, 28 May 2021 04:29:21 -0700
Subject: [PATCH] making way for Manufac data, added notes about logging clean
 up

---
 src/eros/eros.go           | 15 ++++++++++-----
 src/scanStuff/scanStuff.go | 27 ++++++++++++++++++++-------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/eros/eros.go b/src/eros/eros.go
index 91f81f5..5b5874c 100644
--- a/src/eros/eros.go
+++ b/src/eros/eros.go
@@ -7,6 +7,10 @@ package eros
 //	Raw Advertisement Packet (Advertisement)
 //      Services UUIDs (Services)
 
+//	TODO:
+//		Output to report
+//
+
 import (
 	"encoding/json"
 	"time"
@@ -28,10 +32,11 @@ type Characteristic struct {
 
 // Device will hold details about the discoverd device
 type Device struct {
-	Name       string
-	MAC        string
-	RSSIlast   int16
-	RSSIhist   map[time.Time]int16
+	Name         string
+	MAC          string
+	Manufacturer string
+	RSSIlast     int16
+	RSSIhist     map[time.Time]int16
 
 	// Services - see Service struct
 	Services []Service
@@ -56,7 +61,7 @@ var deviceDb *bitcask.Bitcask
 // attackDb will hold details about exploits to be used against BLE devices
 var attackDb *bitcask.Bitcask
 
-// serviceDb will hold definitions of various bluetook services and will ultimately be updated via an HTTP repository 
+// serviceDb will hold definitions of various bluetook services and will ultimately be updated via an HTTP repository
 var serviceDb *bitcask.Bitcask
 
 var err error
diff --git a/src/scanStuff/scanStuff.go b/src/scanStuff/scanStuff.go
index ff868c7..829f9c0 100644
--- a/src/scanStuff/scanStuff.go
+++ b/src/scanStuff/scanStuff.go
@@ -33,6 +33,7 @@ type Meta struct {
 	// BLEScans  map[int]*BLEScan
 	// LoraScans map[int]*LoraScan
 	// ZigScans  map[int]*ZigScan
+	// WiFiScans map[int]*WiFiScan
 }
 
 type Scan struct {
@@ -74,18 +75,24 @@ func (m *Meta) NewScan() *Scan {
 	return scan
 }
 
-func (s *Scan) NewDevice(name string, addr string, rssi int16) *eros.Device {
+func (s *Scan) NewDevice(name string, addr string, manuf string, rssi int16) *eros.Device {
 	newid := len(s.Devices) - 1
 	s.Devices[newid] = &eros.Device{
-		Name:     name,
-		MAC:      addr,
-		RSSIlast: rssi,
+		Name:         name,
+		MAC:          addr,
+		Manufacturer: manuf,
+		RSSIlast:     rssi,
 	}
 
 	s.Count = len(s.Devices)
 	return s.Devices[newid]
 }
 
+func ManfCheck(bluetooth.UUID) string {
+
+	return "Place Holder"
+}
+
 func (s *Scan) Start() error {
 	s.Started = time.Now()
 
@@ -118,15 +125,21 @@ func (s *Scan) Start() error {
 		payload := result.AdvertisementPayload
 		addr := result.Address.String()
 		lname := result.LocalName()
+		manuf := "ManuF Place Holder"
 		//adbytes := payload.Bytes()
 		uuids := payload.ServiceUUIDOut()
 		rssi := result.RSSI
 
 		var sublog zerolog.Logger
 
+		//Services level logging
+		// TODO:
+		//		Fix Loggin output here -- Prob shouldnt output this much info
+		//		for each service discovered
+		//		only each device
 		sublog = log.With().Int("Scan_ID", s.ID).
 			Str("LocalName", lname).Str("MAC", addr).
-			Int16("RSSI", rssi).Logger()
+			Str("ManuF", manuf).Int16("RSSI", rssi).Logger()
 
 		//could add -t option to enable this feature for active tracking
 		// Skipping duplicate results
@@ -141,7 +154,7 @@ func (s *Scan) Start() error {
 		// Upon finding new and valid info we update the time for last activity
 		s.Activity = time.Now()
 
-		dev := s.NewDevice(lname, addr, rssi)
+		dev := s.NewDevice(lname, addr, manuf, rssi)
 
 		AdvServBuf := make([]byte, 255)
 
@@ -180,7 +193,7 @@ func (s *Scan) Start() error {
 			Int("Service_Count", len(fromEros.Services)).
 			Msg("EROS_RECALL")
 
-		if projVars.AttackMode == true && projVars.TrackingMode == false /*changed to false for debug*/ {
+		if projVars.AttackMode == true && projVars.TrackingMode == false /*changed attackmode to false for debug*/ {
 			////////////////////////////////////////////////////////////////////////
 			//var PreTargetHandling type