From 8f761dd76ce052607db3f5aef65d85237e7c3684 Mon Sep 17 00:00:00 2001 From: Stefano Gabryel Date: Sat, 20 Apr 2019 17:03:45 +0200 Subject: [PATCH 1/2] Fixing ignored error in trigger list --- modules/events_stream/trigger_list.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/events_stream/trigger_list.go b/modules/events_stream/trigger_list.go index aac8a176..9668b2b9 100644 --- a/modules/events_stream/trigger_list.go +++ b/modules/events_stream/trigger_list.go @@ -123,7 +123,12 @@ func (l *TriggerList) Dispatch(e session.Event) (ident string, cmd string, err e if node := jsonquery.FindOne(doc, expr); node != nil { cmd = strings.Replace(cmd, m, node.InnerText(), -1) } else { - err = fmt.Errorf("error while parsing expressionfor trigger %s: '%s' doesn't resolve any object", tui.Bold(id), expr, expr, err) + err = fmt.Errorf( + "error while parsing expressionfor trigger %s: '%s' doesn't resolve any object: %v", + tui.Bold(id), + expr, + err, + ) return } } From 0e857e4467dc36ef8c24412bca1ee7537bded238 Mon Sep 17 00:00:00 2001 From: Stefano Gabryel Date: Sat, 20 Apr 2019 16:51:14 +0200 Subject: [PATCH 2/2] Minor improvements to prevent unecessaries allocations --- core/core.go | 4 ++-- modules/net_recon/net_show.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/core.go b/core/core.go index 3761a6c7..e265af6b 100644 --- a/core/core.go +++ b/core/core.go @@ -8,8 +8,8 @@ import ( ) func UniqueInts(a []int, sorted bool) []int { - tmp := make(map[int]bool) - uniq := make([]int, 0) + tmp := make(map[int]bool, len(a)) + uniq := make([]int, 0, len(a)) for _, n := range a { tmp[n] = true diff --git a/modules/net_recon/net_show.go b/modules/net_recon/net_show.go index 01c604a2..da4bcd34 100644 --- a/modules/net_recon/net_show.go +++ b/modules/net_recon/net_show.go @@ -15,7 +15,7 @@ import ( "github.com/evilsocket/islazy/tui" ) -var ( +const ( AliveTimeInterval = time.Duration(10) * time.Second PresentTimeInterval = time.Duration(1) * time.Minute JustJoinedTimeInterval = time.Duration(10) * time.Second @@ -109,7 +109,7 @@ func (mod *Discovery) getRow(e *network.Endpoint, withMeta bool) [][]string { }) sort.Strings(metas) - rows := [][]string{} + rows := make([][]string, 0, len(metas)) for i, m := range metas { if i == 0 { rows = append(rows, append(row, m))