From 39dd0268b09470d2fd9069b21004d543e947d764 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 20 Jun 2018 08:49:44 +0000 Subject: [PATCH] Stop filterUnconnected() modifying its input Helper function filterInternetAdjacencies() would sometimes copy and sometimes not copy the input. Changed to always copy, before calling. --- render/filters.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/render/filters.go b/render/filters.go index eb682ee1e..208bbd64a 100644 --- a/render/filters.go +++ b/render/filters.go @@ -158,10 +158,10 @@ func connected(nodes report.Nodes) map[string]struct{} { // and outgoing internet node. These are typically artifacts of // imperfect connection tracking, e.g. when VIPs and NAT traversal are // in use. -func filterInternetAdjacencies(nodes report.Nodes) report.Nodes { +func filterInternetAdjacencies(nodes report.Nodes) { incomingInternet, ok := nodes[IncomingInternetID] if !ok { - return nodes + return } newAdjacency := report.MakeIDList() for _, dstID := range incomingInternet.Adjacency { @@ -170,9 +170,7 @@ func filterInternetAdjacencies(nodes report.Nodes) report.Nodes { } } incomingInternet.Adjacency = newAdjacency - output := nodes.Copy() - output[IncomingInternetID] = incomingInternet - return output + nodes[IncomingInternetID] = incomingInternet } // ColorConnected colors nodes with the IsConnectedMark key if they @@ -197,7 +195,8 @@ type filterUnconnected struct { // Transform implements Transformer func (f filterUnconnected) Transform(input Nodes) Nodes { - output := filterInternetAdjacencies(input.Nodes) + output := input.Nodes.Copy() + filterInternetAdjacencies(output) connected := connected(output) filtered := input.Filtered for id, node := range output {