guoswork
/
frp
mirror of https://gitee.com/IrisVega/frp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix xtcp visitor panic

This commit is contained in:
fatedier 2018-10-18 13:55:51 +08:00
parent 698219b621
commit 1a8ac148ca
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/proxy_manager.go
View File

@ -13,12 +13,12 @@ import (
) )
const ( const (
ProxyStatusNew = "new" ProxyStatusNew = "new"
ProxyStatusStartErr = "start error" ProxyStatusStartErr = "start error"
ProxyStatusWaitStart = "wait start" ProxyStatusWaitStart = "wait start"
ProxyStatusRunning = "running" ProxyStatusRunning = "running"
ProxyStatusCheckFailed = "check failed" ProxyStatusCheckFailed = "check failed"
ProxyStatusClosed = "closed" ProxyStatusClosed = "closed"
) )
type ProxyManager struct { type ProxyManager struct {

9
client/visitor.go
View File

@ -202,7 +202,16 @@ func (sv *XtcpVisitor) handleConn(userConn frpNet.Conn) {
raddr, err := net.ResolveUDPAddr("udp", raddr, err := net.ResolveUDPAddr("udp",
fmt.Sprintf("%s:%d", g.GlbClientCfg.ServerAddr, g.GlbClientCfg.ServerUdpPort)) fmt.Sprintf("%s:%d", g.GlbClientCfg.ServerAddr, g.GlbClientCfg.ServerUdpPort))
if err != nil {
sv.Error("resolve server UDP addr error")
return
}
visitorConn, err := net.DialUDP("udp", nil, raddr) visitorConn, err := net.DialUDP("udp", nil, raddr)
if err != nil {
sv.Warn("dial server udp addr error: %v", err)
return
}
defer visitorConn.Close() defer visitorConn.Close()
now := time.Now().Unix() now := time.Now().Unix()