fix: reporting module name when it's already running or already stopped

modules/any_proxy/any_proxy.go

@@ -80,7 +80,7 @@ func (mod *AnyProxy) Configure() error {
 	var dstAddress string
 
 	if mod.Running() {
-		return session.ErrAlreadyStarted
+		return session.ErrAlreadyStarted(mod.Name())
 	} else if err, iface = mod.StringParam("any.proxy.iface"); err != nil {
 		return err
 	} else if err, protocol = mod.StringParam("any.proxy.protocol"); err != nil {

modules/api_rest/api_rest.go

@@ -126,7 +126,7 @@ func (mod *RestAPI) Configure() error {
 	var port int
 
 	if mod.Running() {
-		return session.ErrAlreadyStarted
+		return session.ErrAlreadyStarted(mod.Name())
 	} else if err, ip = mod.StringParam("api.rest.address"); err != nil {
 		return err
 	} else if err, port = mod.IntParam("api.rest.port"); err != nil {

modules/ble/ble_recon.go

@@ -140,7 +140,7 @@ func (w dummyWriter) Write(p []byte) (n int, err error) {
 
 func (mod *BLERecon) Configure() (err error) {
 	if mod.Running() {
-		return session.ErrAlreadyStarted
+		return session.ErrAlreadyStarted(mod.Name())
 	} else if mod.gattDevice == nil {
 		mod.Debug("initializing device ...")
 
@@ -239,7 +239,7 @@ func (mod *BLERecon) enumAllTheThings(mac string) error {
 	}
 
 	mod.setCurrentDevice(dev)
-	if err := mod.Configure(); err != nil && err != session.ErrAlreadyStarted {
+	if err := mod.Configure(); err != nil && err != session.ErrAlreadyStarted(mod.Name()) {
 		return err
 	}
 

modules/dhcp6_spoof/dhcp6_spoof.go

@@ -78,7 +78,7 @@ func (mod *DHCP6Spoofer) Configure() error {
 	var err error
 
 	if mod.Running() {
-		return session.ErrAlreadyStarted
+		return session.ErrAlreadyStarted(mod.Name())
 	}
 
 	if mod.Handle, err = pcap.OpenLive(mod.Session.Interface.Name(), 65536, true, pcap.BlockForever); err != nil {

modules/dns_spoof/dns_spoof.go

@@ -87,7 +87,7 @@ func (mod *DNSSpoofer) Configure() error {
 	var address net.IP
 
 	if mod.Running() {
-		return session.ErrAlreadyStarted
+		return session.ErrAlreadyStarted(mod.Name())
 	} else if mod.Handle, err = pcap.OpenLive(mod.Session.Interface.Name(), 65536, true, pcap.BlockForever); err != nil {
 		return err
 	} else if err = mod.Handle.SetBPFFilter("udp"); err != nil {

modules/gps/gps.go

@@ -72,7 +72,7 @@ func (mod *GPS) Author() string {
 
 func (mod *GPS) Configure() (err error) {
 	if mod.Running() {
-		return session.ErrAlreadyStarted
+		return session.ErrAlreadyStarted(mod.Name())
 	} else if err, mod.serialPort = mod.StringParam("gps.device"); err != nil {
 		return err
 	} else if err, mod.baudRate = mod.IntParam("gps.baudrate"); err != nil {

modules/hid/hid.go

@@ -163,7 +163,7 @@ func (mod *HIDRecon) Configure() error {
 	var n int
 
 	if mod.Running() {
-		return session.ErrAlreadyStarted
+		return session.ErrAlreadyStarted(mod.Name())
 	}
 
 	if err, mod.useLNA = mod.BoolParam("hid.lna"); err != nil {

modules/http_proxy/http_proxy.go

@@ -89,7 +89,7 @@ func (mod *HttpProxy) Configure() error {
 	var whitelist string
 
 	if mod.Running() {
-		return session.ErrAlreadyStarted
+		return session.ErrAlreadyStarted(mod.Name())
 	} else if err, address = mod.StringParam("http.proxy.address"); err != nil {
 		return err
 	} else if err, proxyPort = mod.IntParam("http.proxy.port"); err != nil {

modules/http_server/http_server.go

@@ -71,7 +71,7 @@ func (mod *HttpServer) Configure() error {
 	var port int
 
 	if mod.Running() {
-		return session.ErrAlreadyStarted
+		return session.ErrAlreadyStarted(mod.Name())
 	}
 
 	if err, path = mod.StringParam("http.server.path"); err != nil {

modules/https_proxy/https_proxy.go

@@ -106,7 +106,7 @@ func (mod *HttpsProxy) Configure() error {
 	var blacklist string
 
 	if mod.Running() {
-		return session.ErrAlreadyStarted
+		return session.ErrAlreadyStarted(mod.Name())
 	} else if err, address = mod.StringParam("https.proxy.address"); err != nil {
 		return err
 	} else if err, proxyPort = mod.IntParam("https.proxy.port"); err != nil {

modules/https_server/https_server.go

@@ -89,7 +89,7 @@ func (mod *HttpsServer) Configure() error {
 	var keyFile string
 
 	if mod.Running() {
-		return session.ErrAlreadyStarted
+		return session.ErrAlreadyStarted(mod.Name())
 	}
 
 	if err, path = mod.StringParam("https.server.path"); err != nil {

modules/mac_changer/mac_changer.go

@@ -103,7 +103,7 @@ func (mod *MacChanger) setMac(mac net.HardwareAddr) error {
 
 func (mod *MacChanger) Start() error {
 	if mod.Running() {
-		return session.ErrAlreadyStarted
+		return session.ErrAlreadyStarted(mod.Name())
 	} else if err := mod.Configure(); err != nil {
 		return err
 	} else if err := mod.setMac(mod.fakeMac); err != nil {

modules/mysql_server/mysql_server.go

@@ -79,7 +79,7 @@ func (mod *MySQLServer) Configure() error {
 	var port int
 
 	if mod.Running() {
-		return session.ErrAlreadyStarted
+		return session.ErrAlreadyStarted(mod.Name())
 	} else if err, mod.infile = mod.StringParam("mysql.server.infile"); err != nil {
 		return err
 	} else if err, mod.outfile = mod.StringParam("mysql.server.outfile"); err != nil {

modules/net_sniff/net_sniff.go

@@ -146,7 +146,7 @@ func (mod *Sniffer) Configure() error {
 	var err error
 
 	if mod.Running() {
-		return session.ErrAlreadyStarted
+		return session.ErrAlreadyStarted(mod.Name())
 	} else if err, mod.Ctx = mod.GetContext(); err != nil {
 		if mod.Ctx != nil {
 			mod.Ctx.Close()

modules/packet_proxy/packet_proxy_linux_amd64.go

@@ -190,7 +190,7 @@ func dummyCallback(payload *nfqueue.Payload) int {
 
 func (mod *PacketProxy) Start() error {
 	if mod.Running() {
-		return session.ErrAlreadyStarted
+		return session.ErrAlreadyStarted(mod.Name())
 	} else if err := mod.Configure(); err != nil {
 		return err
 	}

modules/tcp_proxy/tcp_proxy.go

@@ -95,7 +95,7 @@ func (mod *TcpProxy) Configure() error {
 	var tunnelPort int
 
 	if mod.Running() {
-		return session.ErrAlreadyStarted
+		return session.ErrAlreadyStarted(mod.Name())
 	} else if err, address = mod.StringParam("tcp.address"); err != nil {
 		return err
 	} else if err, proxyAddress = mod.StringParam("tcp.proxy.address"); err != nil {

modules/ticker/ticker.go

@@ -59,7 +59,7 @@ func (mod *Ticker) Configure() error {
 	var period int
 
 	if mod.Running() {
-		return session.ErrAlreadyStarted
+		return session.ErrAlreadyStarted(mod.Name())
 	} else if err, commands = mod.StringParam("ticker.commands"); err != nil {
 		return err
 	} else if err, period = mod.IntParam("ticker.period"); err != nil {

modules/wifi/wifi_ap.go

@@ -35,7 +35,7 @@ func (mod *WiFiModule) startAp() error {
 	if !mod.Running() {
 		return errNoRecon
 	} else if mod.apRunning {
-		return session.ErrAlreadyStarted
+		return session.ErrAlreadyStarted(mod.Name())
 	}
 
 	go func() {

session/module.go

@@ -230,9 +230,9 @@ func (m *SessionModule) Running() bool {
 func (m *SessionModule) SetRunning(running bool, cb func()) error {
 	if running == m.Running() {
 		if m.Started {
-			return ErrAlreadyStarted
+			return ErrAlreadyStarted(m.Name)
 		} else {
-			return ErrAlreadyStopped
+			return ErrAlreadyStopped(m.Name)
 		}
 	}
 

session/session.go

@@ -35,14 +35,20 @@ const (
 var (
 	I = (*Session)(nil)
 
-	ErrAlreadyStarted = errors.New("module is already running")
-	ErrAlreadyStopped = errors.New("module is not running")
 	ErrNotSupported = errors.New("this component is not supported on this OS")
 
 	reCmdSpaceCleaner = regexp.MustCompile(`^([^\s]+)\s+(.+)$`)
 	reEnvVarCapture   = regexp.MustCompile(`{env\.([^}]+)}`)
 )
 
+func ErrAlreadyStarted(name string) error {
+	return fmt.Errorf("module %s is already running", name)
+}
+
+func ErrAlreadyStopped(name string) error {
+	return fmt.Errorf("module %s is not running", name)
+}
+
 type UnknownCommandCallback func(cmd string) bool
 
 type GPS struct {