From 2c6019efdcc35f7d7b651f8c48e4a4710f9fc1d5 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@kinvolk.io>
Date: Tue, 20 Sep 2016 10:48:11 +0200
Subject: [PATCH] all the hacks

---
 probe/endpoint/ebpf.go      | 17 ++++-------------
 probe/endpoint/ebpf/main.go |  2 +-
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/probe/endpoint/ebpf.go b/probe/endpoint/ebpf.go
index 08847e3c3..5ffabe905 100644
--- a/probe/endpoint/ebpf.go
+++ b/probe/endpoint/ebpf.go
@@ -28,7 +28,6 @@ type connectionEvent struct {
 	DestAddress   net.IP
 	SourcePort    int
 	DestPort      int
-	Netns         int
 }
 
 type EbpfTracker struct {
@@ -92,36 +91,30 @@ func (t *EbpfTracker) run() {
 			continue
 		}
 
-		sAddr := net.ParseIP(line[3])
+		sAddr := net.ParseIP(line[2])
 		if sAddr == nil {
 			log.Errorf("error parsing sAddr %q: %v", line[3], err)
 			continue
 		}
 
-		dAddr := net.ParseIP(line[4])
+		dAddr := net.ParseIP(line[3])
 		if sAddr == nil {
 			log.Errorf("error parsing dAddr %q: %v", line[4], err)
 			continue
 		}
 
-		sPort, err := strconv.Atoi(line[5])
+		sPort, err := strconv.Atoi(line[4])
 		if err != nil {
 			log.Errorf("error parsing sPort %q: %v", line[5], err)
 			continue
 		}
 
-		dPort, err := strconv.Atoi(line[6])
+		dPort, err := strconv.Atoi(line[5])
 		if err != nil {
 			log.Errorf("error parsing dPort %q: %v", line[6], err)
 			continue
 		}
 
-		netns, err := strconv.Atoi(line[6])
-		if err != nil {
-			log.Errorf("error parsing netns %q: %v", line[7], err)
-			continue
-		}
-
 		var evt event
 		switch line[0] {
 		case "connect":
@@ -135,12 +128,10 @@ func (t *EbpfTracker) run() {
 		e := connectionEvent{
 			Type:          evt,
 			Pid:           pid,
-			Command:       line[2],
 			SourceAddress: sAddr,
 			DestAddress:   dAddr,
 			SourcePort:    sPort,
 			DestPort:      dPort,
-			Netns:         netns,
 		}
 
 		fmt.Println(e)
diff --git a/probe/endpoint/ebpf/main.go b/probe/endpoint/ebpf/main.go
index d7cdabe30..2290c4def 100644
--- a/probe/endpoint/ebpf/main.go
+++ b/probe/endpoint/ebpf/main.go
@@ -9,7 +9,7 @@ import (
 )
 
 func main() {
-	tr := endpoint.NewEbpfTracker("/usr/local/share/bcc/examples/tracing/tcpv4tracer.py")
+	tr := endpoint.NewEbpfTracker("/home/asymmetric/code/kinvolk/bcc/examples/tracing/tcpv4tracer.py")
 
 	if tr == nil {
 		fmt.Fprintf(os.Stderr, "error creating tracker\n")