fix: do not show gateway warning if the interface is not connected to…

… any network
pk-mdt · Feb 6, 2019 · 3c79879 · 3c79879
1 parent ae223d7
commit 3c79879
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/session/prompt.go b/session/prompt.go
@@ -10,8 +10,9 @@ import (
 )
 
 const (
-	PromptVariable = "$"
-	DefaultPrompt  = "{by}{fw}{cidr} {fb}> {env.iface.ipv4} {reset} {bold}» {reset}"
+	PromptVariable       = "$"
+	DefaultPrompt        = "{by}{fw}{cidr} {fb}> {env.iface.ipv4} {reset} {bold}» {reset}"
+	DefaultPromptMonitor = "{by}{fb} {env.iface.name} {reset} {bold}» {reset}"
 )
 
 var (

diff --git a/session/session.go b/session/session.go
@@ -227,7 +227,11 @@ func (s *Session) Start() error {
 	}
 
 	if s.Gateway, err = network.FindGateway(s.Interface); err != nil {
-		s.Events.Log(log.WARNING, "%s", err.Error())
+		level := log.WARNING
+		if s.Interface.IsMonitor() {
+			level = log.DEBUG
+		}
+		s.Events.Log(level, "%s", err.Error())
 	}
 
 	if s.Gateway == nil || s.Gateway.IpAddress == s.Interface.IpAddress {

diff --git a/session/session_setup.go b/session/session_setup.go
@@ -131,7 +131,11 @@ func (s *Session) setupEnv() {
 	s.Env.Set("gateway.mac", s.Gateway.HwAddress)
 
 	if found, v := s.Env.Get(PromptVariable); !found || v == "" {
-		s.Env.Set(PromptVariable, DefaultPrompt)
+		if s.Interface.IsMonitor() {
+			s.Env.Set(PromptVariable, DefaultPromptMonitor)
+		} else {
+			s.Env.Set(PromptVariable, DefaultPrompt)
+		}
 	}
 
 	dbg := "false"