freqy/protomolecule
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'development' of ssh://git.tcp.direct:2222/freqy/protomolecule into development

Browse Source
This commit is contained in:
freqyXin 2021-05-30 21:45:27 -07:00
commit b022d32ffe
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main.go
View File

@ -15,6 +15,7 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
// ScanMgr will keep track of concurrently running scans
var ScanMgr *scanStuff.Meta var ScanMgr *scanStuff.Meta
func listen() { func listen() {
@ -31,6 +32,10 @@ func listen() {
if *projVars.TFlag { if *projVars.TFlag {
projVars.TrackingMode = true projVars.TrackingMode = true
} }
if *projVars.MFlag != "0" {
projVars.ManuFile = *projVars.MFlag
}
} }
func obey() { func obey() {
@ -90,8 +95,12 @@ func init() {
// see ./src/eros // see ./src/eros
log.Debug().Msg("Initializing database engine") log.Debug().Msg("Initializing database engine")
eros.Awaken() eros.Awaken()
eros.ManufLoad()
if *projVars.MFlag != "0" {
eros.ManufLoad()
}
} }
func main() { func main() {

2
src/dust/banner.go
View File

File diff suppressed because one or more lines are too long

1
src/vars/projVars.go
View File

@ -44,6 +44,7 @@ var AttackAdapter = bluetooth.DefaultAdapter
var DFlag = flag.Bool("d", false, "global debug logging and pretty printing") var DFlag = flag.Bool("d", false, "global debug logging and pretty printing")
var AFlag = flag.Bool("a", false, "attack mode") var AFlag = flag.Bool("a", false, "attack mode")
var TFlag = flag.Bool("t", false, "device tracking 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() //flag.Parse()