semantics and readme update

README.md

@@ -22,19 +22,19 @@ Cross platform BLE scanner and logger with teeth
 ##  Short Term Needs
 
 - ### Scan for
-  - Device Manufacturer Data
-  - Services UUIDs
+  - ~~Device Manufacturer Data~~
+  - ~~Services UUIDs~~
 
 - ### Go channels to handle scanning (Keep continous background scanning as an option)
 
 - ### Output to simple menu for device target / attack selection (Bubbletea? Pterm?)
 
-- ### Implement bitcask DB to hold device info (will likely need a struct) ** eros **
+- ### ~~Implement bitcask DB to hold device info (will likely need a struct) ** eros **~~
 
-  - MAC (Key)
-  - Device Local Name (data)
-  - Device Manufacturer Data (data)
-  - Services UUIDs (data)
+  - ~~Address (Key)~~
+  - ~~Device Local Name (data)~~
+  - ~~Device Manufacturer Data (data)~~
+  - ~~Services UUIDs (data)~~
 
 - ### Implement- Exploit DB
 
@@ -49,7 +49,7 @@ Cross platform BLE scanner and logger with teeth
 
 - ### GATT fuzzing
 
-- ### Sweyntooth  
+- ### Sweyntooth
 
 - ### Search for DFU
 

src/scanStuff/scanStuff.go

@@ -79,7 +79,7 @@ func (s *Scan) NewDevice(name string, addr string, manuf string, rssi int16) *er
 	newid := len(s.Devices)
 	s.Devices[newid] = &eros.Device{
 		Name:         name,
-		MAC:          addr,
+		Addr:          addr,
 		Manufacturer: manuf,
 		RSSIlast:     rssi,
 	}
@@ -177,7 +177,7 @@ func (s *Scan) resultHandler(scanAdapter *bluetooth.Adapter, result bluetooth.Sc
 
 		log.Info().
 			Str("Name", fromEros.Name).
-			Str("MAC", fromEros.MAC).
+			Str("Addr", fromEros.Addr).
 			Str("ManuF", EnumedManuf). //needs to be changed back to fromEros.Manufacturer
 			Int16("Current_RSSI", fromEros.RSSIlast).
 			Int("Service_Count", len(fromEros.Services)).
@@ -190,14 +190,14 @@ func (s *Scan) resultHandler(scanAdapter *bluetooth.Adapter, result bluetooth.Sc
 	//		for each service discovered
 	//		only each device
 	sublog = log.With().Int("Scan_ID", s.ID).
-		Str("LocalName", lname).Str("MAC", addr).
+		Str("LocalName", lname).Str("Addr", addr).
 		Str("ManuF", EnumedManuf).
 		Int16("RSSI", rssi).Logger()
 
 	// Skipping duplicate results unless tracking mode enabled (to store RSSI as devices move)
 	if projVars.TrackingMode == false {
 		for _, dev := range s.Devices {
-			if addr == dev.MAC {
+			if addr == dev.Addr {
 				return
 			}
 		}