From c5d7efc2467abb6cd8365c83fae68da6924c17f2 Mon Sep 17 00:00:00 2001
From: Mathias Hall-Andersen <mathias@hall-andersen.dk>
Date: Mon, 17 Jul 2017 16:16:18 +0200
Subject: Fixed deadlock in index.go

---
 src/main.go | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'src/main.go')

diff --git a/src/main.go b/src/main.go
index 74e7ec9..4bece16 100644
--- a/src/main.go
+++ b/src/main.go
@@ -17,12 +17,14 @@ func main() {
 	}
 
 	switch os.Args[1] {
+
 	case "-f", "--foreground":
 		foreground = true
 		if len(os.Args) != 3 {
 			return
 		}
 		interfaceName = os.Args[2]
+
 	default:
 		foreground = false
 		if len(os.Args) != 2 {
@@ -48,8 +50,8 @@ func main() {
 	// open TUN device
 
 	tun, err := CreateTUN(interfaceName)
-	log.Println(tun, err)
 	if err != nil {
+		log.Println("Failed to create tun device:", err)
 		return
 	}
 
@@ -69,11 +71,15 @@ func main() {
 	}
 	defer uapi.Close()
 
-	for {
-		conn, err := uapi.Accept()
-		if err != nil {
-			logError.Fatal("accept error:", err)
+	go func() {
+		for {
+			conn, err := uapi.Accept()
+			if err != nil {
+				logError.Fatal("UAPI accept error:", err)
+			}
+			go ipcHandle(device, conn)
 		}
-		go ipcHandle(device, conn)
-	}
+	}()
+
+	device.Wait()
 }
-- 
cgit v1.2.3-59-g8ed1b