From 9fc31b0b2cdbc33aeb4b7c12609691f6cb95d117 Mon Sep 17 00:00:00 2001 From: evilsocket Date: Mon, 8 Jan 2018 08:14:23 +0100 Subject: [PATCH] fix: fixed logging system --- session/events.go | 6 +----- session/modules/net_sniff.go | 14 +++++++------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/session/events.go b/session/events.go index fade6078..a184019d 100644 --- a/session/events.go +++ b/session/events.go @@ -101,11 +101,7 @@ func (p *EventPool) Add(tag string, data interface{}) { e := NewEvent(tag, data) p.events = append([]Event{e}, p.events...) - select { - case p.NewEvents <- e: - break - default: - } + go func() { p.NewEvents <- e }() } func (p *EventPool) Log(level int, format string, args ...interface{}) { diff --git a/session/modules/net_sniff.go b/session/modules/net_sniff.go index caaa3505..31c4c7af 100644 --- a/session/modules/net_sniff.go +++ b/session/modules/net_sniff.go @@ -47,27 +47,27 @@ var ( func (c *SnifferContext) Log(sess *session.Session) { if c.DumpLocal { - sess.Events.Log(session.INFO, "Skip local packets : "+no) + sess.Events.Log(session.INFO, "Skip local packets : %s", no) } else { - sess.Events.Log(session.INFO, "Skip local packets : "+yes) + sess.Events.Log(session.INFO, "Skip local packets : %s", yes) } if c.Verbose { - sess.Events.Log(session.INFO, "Verbose : "+yes) + sess.Events.Log(session.INFO, "Verbose : %s", yes) } else { - sess.Events.Log(session.INFO, "Verbose : "+no) + sess.Events.Log(session.INFO, "Verbose : %s", no) } if c.Filter != "" { - sess.Events.Log(session.INFO, "BPF Filter : '"+core.Yellow(c.Filter)+"'") + sess.Events.Log(session.INFO, "BPF Filter : '%s'", core.Yellow(c.Filter)) } if c.Expression != "" { - sess.Events.Log(session.INFO, "Regular expression : '"+core.Yellow(c.Expression)+"'") + sess.Events.Log(session.INFO, "Regular expression : '%s'", core.Yellow(c.Expression)) } if c.Output != "" { - sess.Events.Log(session.INFO, "File output : '"+core.Yellow(c.Output)+"'") + sess.Events.Log(session.INFO, "File output : '%s'", core.Yellow(c.Output)) } }