From e64a24dd13d50aa8fcb85c6198a22eb3c597ff69 Mon Sep 17 00:00:00 2001
From: evilsocket <evilsocket@gmail.com>
Date: Mon, 5 Feb 2018 18:56:52 +0100
Subject: [PATCH] refact: better sniffer messages

---
 modules/events_view.go       | 4 +---
 modules/net_sniff_dns.go     | 3 +--
 modules/net_sniff_http.go    | 3 +--
 modules/net_sniff_parsers.go | 9 +++------
 modules/net_sniff_sni.go     | 3 +--
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/modules/events_view.go b/modules/events_view.go
index 25c5e6af..aeac1761 100644
--- a/modules/events_view.go
+++ b/modules/events_view.go
@@ -37,11 +37,9 @@ func (s EventsStream) viewModuleEvent(e session.Event) {
 
 func (s EventsStream) viewSnifferEvent(e session.Event) {
 	se := e.Data.(SnifferEvent)
-	fmt.Printf("[%s] [%s] %s > %s | %s\n",
+	fmt.Printf("[%s] [%s] %s\n",
 		e.Time.Format(eventTimeFormat),
 		core.Green(e.Tag),
-		se.Source,
-		se.Destination,
 		se.Message)
 }
 
diff --git a/modules/net_sniff_dns.go b/modules/net_sniff_dns.go
index 0f2680f7..a868a645 100644
--- a/modules/net_sniff_dns.go
+++ b/modules/net_sniff_dns.go
@@ -43,8 +43,7 @@ func dnsParser(ip *layers.IPv4, pkt gopacket.Packet, udp *layers.UDP) bool {
 				"Hostname":  hostname,
 				"Addresses": ips,
 			},
-			"[%s] %s %s > %s : %s is %s",
-			vTime(pkt.Metadata().Timestamp),
+			"%s %s > %s : %s is %s",
 			core.W(core.BG_DGRAY+core.FG_WHITE, "dns"),
 			vIP(ip.SrcIP),
 			vIP(ip.DstIP),
diff --git a/modules/net_sniff_http.go b/modules/net_sniff_http.go
index 4edfea22..6836e99c 100644
--- a/modules/net_sniff_http.go
+++ b/modules/net_sniff_http.go
@@ -52,8 +52,7 @@ func httpParser(ip *layers.IPv4, pkt gopacket.Packet, tcp *layers.TCP) bool {
 			"path":   url,
 			"agent":  ua,
 		},
-		"[%s] %s %s %s %s %s",
-		vTime(pkt.Metadata().Timestamp),
+		"%s %s %s %s %s",
 		core.W(core.BG_RED+core.FG_BLACK, "http"),
 		vIP(ip.SrcIP),
 		core.W(core.BG_LBLUE+core.FG_BLACK, method),
diff --git a/modules/net_sniff_parsers.go b/modules/net_sniff_parsers.go
index 6a4b88a0..ef62ebb2 100644
--- a/modules/net_sniff_parsers.go
+++ b/modules/net_sniff_parsers.go
@@ -28,8 +28,7 @@ func tcpParser(ip *layers.IPv4, pkt gopacket.Packet, verbose bool) {
 			SniffData{
 				"Size": len(ip.Payload),
 			},
-			"[%s] %s %s:%s > %s:%s %s",
-			vTime(pkt.Metadata().Timestamp),
+			"%s %s:%s > %s:%s %s",
 			core.W(core.BG_LBLUE+core.FG_BLACK, "tcp"),
 			vIP(ip.SrcIP),
 			vPort(tcp.SrcPort),
@@ -56,8 +55,7 @@ func udpParser(ip *layers.IPv4, pkt gopacket.Packet, verbose bool) {
 			SniffData{
 				"Size": len(ip.Payload),
 			},
-			"[%s] %s %s:%s > %s:%s %s",
-			vTime(pkt.Metadata().Timestamp),
+			"%s %s:%s > %s:%s %s",
 			core.W(core.BG_DGRAY+core.FG_WHITE, "udp"),
 			vIP(ip.SrcIP),
 			vPort(udp.SrcPort),
@@ -78,8 +76,7 @@ func unkParser(ip *layers.IPv4, pkt gopacket.Packet, verbose bool) {
 			SniffData{
 				"Size": len(ip.Payload),
 			},
-			"[%s] %s %s > %s %s",
-			vTime(pkt.Metadata().Timestamp),
+			"%s %s > %s %s",
 			core.W(core.BG_DGRAY+core.FG_WHITE, pkt.TransportLayer().LayerType().String()),
 			vIP(ip.SrcIP),
 			vIP(ip.DstIP),
diff --git a/modules/net_sniff_sni.go b/modules/net_sniff_sni.go
index 87c0bfc0..bd1d1fb2 100644
--- a/modules/net_sniff_sni.go
+++ b/modules/net_sniff_sni.go
@@ -39,8 +39,7 @@ func sniParser(ip *layers.IPv4, pkt gopacket.Packet, tcp *layers.TCP) bool {
 		SniffData{
 			"Domain": domain,
 		},
-		"[%s] %s %s > %s",
-		vTime(pkt.Metadata().Timestamp),
+		"%s %s > %s",
 		core.W(core.BG_YELLOW+core.FG_WHITE, "sni"),
 		vIP(ip.SrcIP),
 		core.Yellow("https://"+domain),