(1)优化重连和心跳检测

.gitignore

@@ -26,3 +26,5 @@ _testmain.go
 # Self
 bin/
 
+# Cache
+*.swp

cmd/frpc/control.go

@@ -15,8 +15,7 @@ const (
 	heartbeatDuration = 2 //心跳检测时间间隔，单位秒
 )
 
-// client与server之间连接的保护锁
+var isHeartBeatContinue bool = true
-var connProtect sync.Mutex
 
 func ControlProcess(cli *models.ProxyClient, wait *sync.WaitGroup) {
 	defer wait.Done()
@@ -28,13 +27,11 @@ func ControlProcess(cli *models.ProxyClient, wait *sync.WaitGroup) {
 	}
 	defer c.Close()
 
-	go startHeartBeat(c)
-
 	for {
 		// ignore response content now
 		_, err := c.ReadLine()
 		if err == io.EOF {
-			connProtect.Lock() // 除了这里，其他地方禁止对连接进行任何操作
+			isHeartBeatContinue = false
 			log.Debug("ProxyName [%s], server close this control conn", cli.Name)
 			var sleepTime time.Duration = 1
 			for {
@@ -51,7 +48,6 @@ func ControlProcess(cli *models.ProxyClient, wait *sync.WaitGroup) {
 				}
 				time.Sleep(sleepTime * time.Second)
 			}
-			connProtect.Unlock()
 			continue
 		} else if err != nil {
 			log.Warn("ProxyName [%s], read from server error, %v", cli.Name, err)
@@ -104,6 +100,8 @@ func loginToServer(cli *models.ProxyClient) (connection *conn.Conn) {
 		}
 
 		connection = c
+		go startHeartBeat(connection)
+		log.Debug("ProxyName [%s], connect to server[%s:%d] success!", cli.Name, ServerAddr, ServerPort)
 	}
 
 	if connection == nil {
@@ -114,14 +112,17 @@ func loginToServer(cli *models.ProxyClient) (connection *conn.Conn) {
 }
 
 func startHeartBeat(con *conn.Conn) {
+	isHeartBeatContinue = true
 	for {
 		time.Sleep(heartbeatDuration * time.Second)
-
+		if isHeartBeatContinue { // 把isHeartBeatContinue放在这里是为了防止SIGPIPE
-		connProtect.Lock()
+			err := con.Write("\r\n")
-		err := con.Write("\r\n")
+			//log.Debug("send heart beat to server!")
-		connProtect.Unlock()
+			if err != nil {
-		if err != nil {
+				log.Error("Send hearbeat to server failed! Err:%s", err.Error())
-			log.Error("Send hearbeat to server failed! Err:%s", err.Error())
+			}
+		} else {
+			break
 		}
 	}
 }

cmd/frps/control.go

@@ -1,12 +1,14 @@
 package main
 
 import (
-	"fmt"
 	"encoding/json"
+	"fmt"
+	"io"
+	"time"
 
-	"frp/pkg/utils/log"
-	"frp/pkg/utils/conn"
 	"frp/pkg/models"
+	"frp/pkg/utils/conn"
+	"frp/pkg/utils/log"
 )
 
 func ProcessControlConn(l *conn.Listener) {
@@ -19,6 +21,8 @@ func ProcessControlConn(l *conn.Listener) {
 
 // control connection from every client and server
 func controlWorker(c *conn.Conn) {
+	defer c.Close()
+
 	// the first message is from client to server
 	// if error, close connection
 	res, err := c.ReadLine()
@@ -47,13 +51,14 @@ func controlWorker(c *conn.Conn) {
 		err = c.Write(string(buf) + "\n")
 		if err != nil {
 			log.Warn("Write error, %v", err)
+			time.Sleep(1 * time.Second)
+			return
 		}
 	} else {
-	// work conn, just return
+		// work conn, just return
 		return
 	}
 
-	defer c.Close()
 	// others is from server to client
 	server, ok := ProxyServers[clientCtlReq.ProxyName]
 	if !ok {
@@ -61,10 +66,16 @@ func controlWorker(c *conn.Conn) {
 		return
 	}
 
+	// read control msg from client
+	go readControlMsgFromClient(server, c)
+
 	serverCtlReq := &models.ClientCtlReq{}
 	serverCtlReq.Type = models.WorkConn
 	for {
-		server.WaitUserConn()
+		_, isStop := server.WaitUserConn()
+		if isStop {
+			break
+		}
 		buf, _ := json.Marshal(serverCtlReq)
 		err = c.Write(string(buf) + "\n")
 		if err != nil {
@@ -76,6 +87,7 @@ func controlWorker(c *conn.Conn) {
 		log.Debug("ProxyName [%s], write to client to add work conn success", server.Name)
 	}
 
+	log.Error("ProxyName [%s], I'm dead!", server.Name)
 	return
 }
 
@@ -115,7 +127,7 @@ func checkProxy(req *models.ClientCtlReq, c *conn.Conn) (succ bool, msg string,
 
 		log.Info("ProxyName [%s], start proxy success", req.ProxyName)
 	} else if req.Type == models.WorkConn {
-	// work conn
+		// work conn
 		needRes = false
 		if server.Status != models.Working {
 			log.Warn("ProxyName [%s], is not working when it gets one new work conn", req.ProxyName)
@@ -132,3 +144,32 @@ func checkProxy(req *models.ClientCtlReq, c *conn.Conn) (succ bool, msg string,
 	succ = true
 	return
 }
+
+func readControlMsgFromClient(server *models.ProxyServer, c *conn.Conn) {
+	isContinueRead := true
+	f := func() {
+		isContinueRead = false
+		server.StopWaitUserConn()
+	}
+	timer := time.AfterFunc(10*time.Second, f)
+	defer timer.Stop()
+
+	for isContinueRead {
+		content, err := c.ReadLine()
+		//log.Debug("Receive msg from client! content:%s", content)
+		if err != nil {
+			if err == io.EOF {
+				log.Warn("Server detect client[%s] is dead!", server.Name)
+				server.StopWaitUserConn()
+				break
+			}
+			log.Error("ProxyName [%s], read error:%s", server.Name, err.Error())
+			continue
+		}
+
+		if content == "\r\n" {
+			log.Debug("receive hearbeat:%s", content)
+			timer.Reset(10 * time.Second)
+		}
+	}
+}

pkg/models/server.go

@@ -1,8 +1,8 @@
 package models
 
 import (
-	"sync"
 	"container/list"
+	"sync"
 
 	"frp/pkg/utils/conn"
 	"frp/pkg/utils/log"
@@ -14,22 +14,24 @@ const (
 )
 
 type ProxyServer struct {
-	Name			string
+	Name       string
-	Passwd			string
+	Passwd     string
-	BindAddr		string
+	BindAddr   string
-	ListenPort		int64
+	ListenPort int64
 
-	Status			int64
+	Status        int64
-	Listener		*conn.Listener		// accept new connection from remote users
+	Listener      *conn.Listener  // accept new connection from remote users
-	CtlMsgChan		chan int64			// every time accept a new user conn, put "1" to the channel
+	CtlMsgChan    chan int64      // every time accept a new user conn, put "1" to the channel
-	CliConnChan		chan *conn.Conn		// get client conns from control goroutine
+	StopBlockChan chan int64      // put any number to the channel, if you want to stop wait user conn
-	UserConnList	*list.List			// store user conns
+	CliConnChan   chan *conn.Conn // get client conns from control goroutine
-	Mutex			sync.Mutex
+	UserConnList  *list.List      // store user conns
+	Mutex         sync.Mutex
 }
 
 func (p *ProxyServer) Init() {
 	p.Status = Idle
 	p.CtlMsgChan = make(chan int64)
+	p.StopBlockChan = make(chan int64)
 	p.CliConnChan = make(chan *conn.Conn)
 	p.UserConnList = list.New()
 }
@@ -93,7 +95,7 @@ func (p *ProxyServer) Start() (err error) {
 
 			// msg will transfer to another without modifying
 			log.Debug("Join two conns, (l[%s] r[%s]) (l[%s] r[%s])", cliConn.GetLocalAddr(), cliConn.GetRemoteAddr(),
-					userConn.GetLocalAddr(), userConn.GetRemoteAddr())
+				userConn.GetLocalAddr(), userConn.GetRemoteAddr())
 			go conn.Join(cliConn, userConn)
 		}
 	}()
@@ -110,7 +112,15 @@ func (p *ProxyServer) Close() {
 	p.Unlock()
 }
 
-func (p *ProxyServer) WaitUserConn() (res int64) {
+func (p *ProxyServer) WaitUserConn() (res int64, isStop bool) {
-	res = <-p.CtlMsgChan
+	select {
-	return 
+	case res = <-p.CtlMsgChan:
+		return res, false
+	case <-p.StopBlockChan:
+		return 0, true
+	}
+}
+
+func (p *ProxyServer) StopWaitUserConn() {
+	p.StopBlockChan <- 1
 }

pkg/utils/conn/conn.go

@@ -1,18 +1,18 @@
 package conn
 
 import (
-	"fmt"
-	"net"
 	"bufio"
-	"sync"
+	"fmt"
 	"io"
+	"net"
+	"sync"
 
 	"frp/pkg/utils/log"
 )
 
 type Listener struct {
-	Addr	net.Addr
+	Addr  net.Addr
-	Conns	chan *Conn
+	Conns chan *Conn
 }
 
 // wait util get one
@@ -22,8 +22,8 @@ func (l *Listener) GetConn() (conn *Conn) {
 }
 
 type Conn struct {
-	TcpConn		*net.TCPConn
+	TcpConn *net.TCPConn
-	Reader		*bufio.Reader
+	Reader  *bufio.Reader
 }
 
 func (c *Conn) ConnectServer(host string, port int64) (err error) {
@@ -59,7 +59,9 @@ func (c *Conn) Write(content string) (err error) {
 }
 
 func (c *Conn) Close() {
-	c.TcpConn.Close()
+	if c.TcpConn != nil { // ZWF:我觉得应该加一个非空保护
+		c.TcpConn.Close()
+	}
 }
 
 func Listen(bindAddr string, bindPort int64) (l *Listener, err error) {
@@ -70,8 +72,8 @@ func Listen(bindAddr string, bindPort int64) (l *Listener, err error) {
 	}
 
 	l = &Listener{
-		Addr:	listener.Addr(),
+		Addr:  listener.Addr(),
-		Conns:	make(chan *Conn),
+		Conns: make(chan *Conn),
 	}
 
 	go func() {
@@ -83,7 +85,7 @@ func Listen(bindAddr string, bindPort int64) (l *Listener, err error) {
 			}
 
 			c := &Conn{
-				TcpConn:	conn,
+				TcpConn: conn,
 			}
 			c.Reader = bufio.NewReader(c.TcpConn)
 			l.Conns <- c