From 2a484d3a61e4a6d4232e5b49ad23a188b8c905e5 Mon Sep 17 00:00:00 2001 From: Tsao Date: Thu, 12 Jan 2017 17:50:32 +0800 Subject: [PATCH] Bug#227 --- Makefile.cross-compiles | 2 +- src/cmd/frps/control.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) mode change 100644 => 100755 Makefile.cross-compiles diff --git a/Makefile.cross-compiles b/Makefile.cross-compiles old mode 100644 new mode 100755 index 71d634ef..8072e250 --- a/Makefile.cross-compiles +++ b/Makefile.cross-compiles @@ -1,4 +1,4 @@ -export PATH := $(GOPATH)/bin:$(PATH) +export PATH := $PATH export GO15VENDOREXPERIMENT := 1 all: build diff --git a/src/cmd/frps/control.go b/src/cmd/frps/control.go index a6cd6a3f..628a405f 100644 --- a/src/cmd/frps/control.go +++ b/src/cmd/frps/control.go @@ -91,6 +91,9 @@ func controlWorker(c *conn.Conn) { return } + if ret == 999 { + closeFlag = false + } // if login failed, just return if ret > 0 { return @@ -273,6 +276,7 @@ func doLogin(req *msg.ControlReq, c *conn.Conn) (ret int64, info string, s *serv if err != nil { info = fmt.Sprintf("ProxyName [%s], %v", req.ProxyName, err) log.Warn(info) + ret = 999 return } }