added CLI flag for loading JSON manufacturer data

main.go

@@ -15,6 +15,7 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
+// ScanMgr will keep track of concurrently running scans
 var ScanMgr *scanStuff.Meta
 
 func listen() {
@@ -31,6 +32,10 @@ func listen() {
 	if *projVars.TFlag {
 		projVars.TrackingMode = true
 	}
+
+	if *projVars.MFlag != "0" {
+		projVars.ManuFile = *projVars.MFlag
+	}
 }
 
 func obey() {
@@ -53,7 +58,6 @@ func init() {
 
 	dust.PrintBanner()
 
-
 	ScanMgr = &scanStuff.Meta{
 		Count: 0,
 		Scans: make(map[int]*scanStuff.Scan),
@@ -91,8 +95,12 @@ func init() {
 
 	// see ./src/eros
 	log.Debug().Msg("Initializing database engine")
+
 	eros.Awaken()
-	eros.ManufLoad()
+
+	if *projVars.MFlag != "0" {
+		eros.ManufLoad()
+	}
 }
 
 func main() {

src/eros/eros.go

@@ -34,10 +34,9 @@ var (
 	// serviceDb will hold definitions of various bluetook services and will ultimately be updated via an HTTP repository
 	serviceDb *bitcask.Bitcask
 
-	err error
+	err           error
 	Manufacturers ManufData
 
-
 	// DataDir - should be defined by config or cmd flag
 	DataDir string = "./.eros-data/"
 )
@@ -114,11 +113,10 @@ type Payload struct {
 	// placeholder
 }
 
-
 // Ingest UUID will add the UUID to the manufacturer if it doesn't already exist
 func (manuf *Manufacturer) IngestUUID(uuid bluetooth.UUID) bool {
 
-	contains := func (s []bluetooth.UUID, v bluetooth.UUID) bool {
+	contains := func(s []bluetooth.UUID, v bluetooth.UUID) bool {
 		for _, a := range s {
 			if a == v {
 				return true

src/vars/projVars.go

@@ -44,6 +44,7 @@ var AttackAdapter = bluetooth.DefaultAdapter
 var DFlag = flag.Bool("d", false, "global debug logging and pretty printing")
 var AFlag = flag.Bool("a", false, "attack mode")
 var TFlag = flag.Bool("t", false, "device tracking mode")
+var MFlag = flag.String("m", "0", "json file with manufacturer identifying data to preload into eros")
 
 //flag.Parse()