add wsReadDeadline to prevent network switch but connection still est…

…ablished
openatx · Nov 7, 2017 · 73aa359 · 73aa359
1 parent e93e51b
commit 73aa359
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/main.go b/main.go
@@ -656,7 +656,7 @@ func main() {
 		os.Stdin = nil
 
 		log.SetOutput(f)
-		log.Println("Ignore SIGUP")
+		log.Println("Ignore SIGHUP")
 		signal.Ignore(syscall.SIGHUP)
 
 		// kill previous daemon first

diff --git a/tunnelproxy.go b/tunnelproxy.go
@@ -86,10 +86,16 @@ func unsafeRunTunnelProxy(serverAddr string) error {
 		Data: devInfo,
 	})
 
+	// when network switch, connection still exists, but no ping comes
+	// server ping interval now is 10s
+	const wsReadWait = 60 * time.Second
+	ws.SetReadDeadline(time.Now().Add(wsReadWait))
 	ws.SetPingHandler(func(string) error {
+		ws.SetReadDeadline(time.Now().Add(wsReadWait))
 		ws.WriteMessage(websocket.PongMessage, []byte{})
 		return nil
 	})
+
 	for {
 		_, _, err := ws.ReadMessage()
 		if err != nil {