misc: small fix or general refactoring i did not bother commenting

modules/events_stream/events_view.go

@@ -134,8 +134,8 @@ func (mod *EventsStream) Render(output io.Writer, e session.Event) {
 		mod.viewUpdateEvent(output, e)
 	} else if e.Tag == "gateway.change" {
 		mod.viewGatewayEvent(output, e)
-	} else if e.Tag == "mdns.service" {
-		mod.viewMDNSEvent(output, e)
+	} else if strings.HasPrefix(e.Tag, "zeroconf.") {
+		mod.viewZeroConfEvent(output, e)
 	} else if e.Tag != "tick" && e.Tag != "session.started" && e.Tag != "session.stopped" {
 		fmt.Fprintf(output, "[%s] [%s] %v\n", e.Time.Format(mod.timeFormat), tui.Green(e.Tag), e)
 	}

modules/events_stream/events_view_mdns.go

@@ -1,23 +0,0 @@
-package events_stream
-
-import (
-	"fmt"
-	"io"
-
-	"github.com/bettercap/bettercap/v2/modules/zerogod"
-	"github.com/bettercap/bettercap/v2/session"
-	"github.com/evilsocket/islazy/tui"
-)
-
-func (mod *EventsStream) viewMDNSEvent(output io.Writer, e session.Event) {
-	event := e.Data.(zerogod.ServiceDiscoveryEvent)
-	fmt.Fprintf(output, "[%s] [%s] service %s detected for %s (%s):%d with %d records\n",
-		e.Time.Format(mod.timeFormat),
-		tui.Green(e.Tag),
-		tui.Bold(event.Service.ServiceInstanceName()),
-		event.Service.AddrIPv4,
-		tui.Dim(event.Service.HostName),
-		event.Service.Port,
-		len(event.Service.Text),
-	)
-}

modules/events_stream/events_view_zeroconf.go

@@ -0,0 +1,62 @@
+package events_stream
+
+import (
+	"fmt"
+	"io"
+	"strings"
+
+	"github.com/bettercap/bettercap/v2/modules/zerogod"
+	"github.com/bettercap/bettercap/v2/session"
+	"github.com/evilsocket/islazy/tui"
+)
+
+func (mod *EventsStream) viewZeroConfEvent(output io.Writer, e session.Event) {
+	if e.Tag == "zeroconf.service" {
+		event := e.Data.(zerogod.ServiceDiscoveryEvent)
+		fmt.Fprintf(output, "[%s] [%s] service %s detected for %s (%s):%d with %d records\n",
+			e.Time.Format(mod.timeFormat),
+			tui.Green(e.Tag),
+			tui.Bold(event.Service.ServiceInstanceName()),
+			event.Service.AddrIPv4,
+			tui.Dim(event.Service.HostName),
+			event.Service.Port,
+			len(event.Service.Text),
+		)
+	} else if e.Tag == "zeroconf.browsing" {
+		event := e.Data.(zerogod.BrowsingEvent)
+		source := event.Source
+		if event.Endpoint != nil {
+			source = event.Endpoint.ShortString()
+		}
+
+		services := make([]string, 0)
+		for _, q := range event.Query.Questions {
+			services = append(services, tui.Yellow(string(q.Name)))
+		}
+		/*
+			instances := make([]string, 0)
+			answers := append(event.Query.Answers, event.Query.Additionals...)
+			for _, answer := range answers {
+				if answer.Class == layers.DNSClassIN && answer.Type == layers.DNSTypePTR {
+					instances = append(instances, tui.Green(string(answer.PTR)))
+				} else {
+					instances = append(instances, tui.Green(answer.String()))
+				}
+			}
+
+			advPart := ""
+			if len(instances) > 0 {
+				advPart = fmt.Sprintf(" and advertising %s", strings.Join(instances, ", "))
+			}
+		*/
+
+		fmt.Fprintf(output, "[%s] [%s] %s is browsing for services %s\n",
+			e.Time.Format(mod.timeFormat),
+			tui.Green(e.Tag),
+			source,
+			strings.Join(services, ", "),
+		)
+	} else {
+		fmt.Fprintf(output, "[%s] [%s] %v\n", e.Time.Format(mod.timeFormat), tui.Green(e.Tag), e)
+	}
+}