From e2c4fce5732403fe73ef848f3430a8df1b7283dd Mon Sep 17 00:00:00 2001
From: evilsocket <evilsocket@gmail.com>
Date: Thu, 1 Feb 2018 10:52:03 +0100
Subject: [PATCH] fix: better events view

---
 modules/events_view.go | 40 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/modules/events_view.go b/modules/events_view.go
index 6baeeea2..93f64ffd 100644
--- a/modules/events_view.go
+++ b/modules/events_view.go
@@ -2,9 +2,11 @@ package modules
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 
 	"github.com/evilsocket/bettercap-ng/core"
+	"github.com/evilsocket/bettercap-ng/net"
 	"github.com/evilsocket/bettercap-ng/session"
 )
 
@@ -18,20 +20,52 @@ func (s EventsStream) viewLogEvent(e session.Event) {
 		e.Data.(session.LogMessage).Message)
 }
 
+func (s EventsStream) viewTargetEvent(e session.Event) {
+	t := e.Data.(*net.Endpoint)
+	fmt.Printf("[%s] [%s] %s\n",
+		e.Time.Format(eventTimeFormat),
+		core.Green(e.Tag),
+		t)
+}
+
+func (s EventsStream) viewModuleEvent(e session.Event) {
+	fmt.Printf("[%s] [%s] %s\n",
+		e.Time.Format(eventTimeFormat),
+		core.Green(e.Tag),
+		e.Data)
+}
+
 func (s EventsStream) viewSnifferEvent(e session.Event) {
 	se := e.Data.(SnifferEvent)
-	fmt.Printf("[%s] [%s] %s > %s | %v\n",
+
+	fmt.Printf("[%s] [%s] %s > %s | ",
 		e.Time.Format(eventTimeFormat),
 		core.Green(e.Tag),
 		se.Source,
-		se.Destination,
-		se.Data)
+		se.Destination)
+
+	keys := make([]string, 0)
+	for k, _ := range se.Data {
+		keys = append(keys, k)
+	}
+
+	sort.Strings(keys)
+
+	for _, k := range keys {
+		fmt.Printf("%s=%s ", core.Green(k), se.Data[k])
+	}
+
+	fmt.Println()
 }
 
 func (s *EventsStream) View(e session.Event, refresh bool) {
 	if s.filter == "" || strings.Contains(e.Tag, s.filter) {
 		if e.Tag == "sys.log" {
 			s.viewLogEvent(e)
+		} else if strings.HasPrefix(e.Tag, "target.") {
+			s.viewTargetEvent(e)
+		} else if strings.HasPrefix(e.Tag, "mod.") {
+			s.viewModuleEvent(e)
 		} else if strings.HasPrefix(e.Tag, "net.sniff.") {
 			s.viewSnifferEvent(e)
 		} else {