From 65a75474152a3de0d1f4c069178059119fd2e197 Mon Sep 17 00:00:00 2001
From: Peter Bourgon <peter@bourgon.org>
Date: Tue, 29 Sep 2015 18:51:13 +0200
Subject: [PATCH] Intermediate stage fix

---
 probe/endpoint/reporter.go | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/probe/endpoint/reporter.go b/probe/endpoint/reporter.go
index ec239cc3e..7f4332652 100644
--- a/probe/endpoint/reporter.go
+++ b/probe/endpoint/reporter.go
@@ -50,30 +50,29 @@ var SpyDuration = prometheus.NewSummaryVec(
 // with process (PID) information.
 func NewReporter(hostID, hostName string, includeProcesses bool, useConntrack bool) *Reporter {
 	var (
-		conntrackModulePresent = ConntrackModulePresent()
-		conntracker            Conntracker
-		natmapper              NATMapper
-		err                    error
+		conntracker Conntracker
+		natmapper   *NATMapper
 	)
-	if conntrackModulePresent && useConntrack {
-		conntracker, err = NewConntracker(true)
-		if err != nil {
-			log.Printf("Failed to start conntracker: %v", err)
+	if ConntrackModulePresent() {
+		if useConntrack {
+			var err error
+			if conntracker, err = NewConntracker(true); err != nil {
+				log.Printf("Failed to start conntracker for endpoint reporter: %v", err)
+			}
 		}
-	}
-	if conntrackModulePresent {
-		ct, err := NewConntracker(true, "--any-nat")
-		if err != nil {
-			log.Printf("Failed to start conntracker for natmapper: %v", err)
+		if natmapperConntracker, err := NewConntracker(true, "--any-nat"); err == nil {
+			m := MakeNATMapper(natmapperConntracker)
+			natmapper = &m
+		} else {
+			log.Printf("Failed to start conntracker for NAT mapper: %v", err)
 		}
-		natmapper = MakeNATMapper(ct)
 	}
 	return &Reporter{
 		hostID:           hostID,
 		hostName:         hostName,
 		includeProcesses: includeProcesses,
 		conntracker:      conntracker,
-		natmapper:        &natmapper,
+		natmapper:        natmapper,
 		revResolver:      NewReverseResolver(),
 	}
 }