From 54299dc0fd2dddf892495d15d0338a3f481af113 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Tue, 15 Sep 2015 10:02:26 +0000 Subject: [PATCH] Review feedback. --- probe/endpoint/conntrack.go | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/probe/endpoint/conntrack.go b/probe/endpoint/conntrack.go index 5bf61ae5c..520426a35 100644 --- a/probe/endpoint/conntrack.go +++ b/probe/endpoint/conntrack.go @@ -164,9 +164,7 @@ func (c *Conntracker) run(args ...string) { return } - defer func() { - log.Printf("contrack exiting") - }() + defer log.Printf("contrack exiting") // Now loop on the output stream decoder := xml.NewDecoder(reader) @@ -181,28 +179,28 @@ func (c *Conntracker) run(args ...string) { } func (c *Conntracker) existingConnections(args ...string) ([]Flow, error) { - var conntrack conntrack args = append([]string{"-L", "-o", "xml", "-p", "tcp"}, args...) cmd := exec.Command("conntrack", args...) stdout, err := cmd.StdoutPipe() if err != nil { - return conntrack.Flows, err + return []Flow{}, err } if err := cmd.Start(); err != nil { - return conntrack.Flows, err + return []Flow{}, err } defer func() { if err := cmd.Wait(); err != nil { log.Printf("conntrack existingConnections exit error: %v", err) } }() - if err := xml.NewDecoder(stdout).Decode(&conntrack); err != nil { + var result conntrack + if err := xml.NewDecoder(stdout).Decode(&result); err != nil { if err == io.EOF { - return conntrack.Flows, err + return []Flow{}, err } - return conntrack.Flows, err + return []Flow{}, err } - return conntrack.Flows, nil + return result.Flows, nil } // Stop stop stop