From 235eed3d84c208beb3ea484b9ea2aa2bfe7bb93d Mon Sep 17 00:00:00 2001
From: Christine Dodrill <me@christine.website>
Date: Sat, 30 Sep 2017 10:42:09 -0700
Subject: [PATCH] tun2: catch panics

---
 lib/tun2/server.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/tun2/server.go b/lib/tun2/server.go
index 7d3b04e..12253c0 100644
--- a/lib/tun2/server.go
+++ b/lib/tun2/server.go
@@ -340,6 +340,12 @@ func (s *Server) HandleConn(c net.Conn, isKCP bool) {
 		Auth:     auth,
 	}
 
+	defer func() {
+		if r := recover(); r != nil {
+			ln.Log(connection, ln.F{"action": "connection handler panic", "err": r})
+		}
+	}()
+
 	ln.Log(ln.F{
 		"action": "backend_connected",
 	}, connection.F())