guoswork/frp
1
0
Fork 0
mirror of https://gitee.com/IrisVega/frp.git synced 2024-11-01 22:31:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

udp proxy: fix #652

Browse Source
This commit is contained in:
fatedier 2018-03-19 20:22:15 +08:00
parent 9e8980429f
commit e9241aeb94
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
models/proto/udp/udp.go
View File

@ -82,6 +82,7 @@ func Forwarder(dstAddr *net.UDPAddr, readCh <-chan *msg.UdpPacket, sendCh chan<-
mu.Lock() mu.Lock()
delete(udpConnMap, addr) delete(udpConnMap, addr)
mu.Unlock() mu.Unlock()
udpConn.Close()
}() }()
buf := pool.GetBuf(1500) buf := pool.GetBuf(1500)

6
server/control.go
View File

@ -265,13 +265,14 @@ func (ctl *Control) stoper() {
ctl.conn.Close() ctl.conn.Close()
ctl.readerShutdown.WaitDone() ctl.readerShutdown.WaitDone()
ctl.mu.Lock()
defer ctl.mu.Unlock()
close(ctl.workConnCh) close(ctl.workConnCh)
for workConn := range ctl.workConnCh { for workConn := range ctl.workConnCh {
workConn.Close() workConn.Close()
} }
ctl.mu.Lock()
defer ctl.mu.Unlock()
for _, pxy := range ctl.proxies { for _, pxy := range ctl.proxies {
pxy.Close() pxy.Close()
ctl.svr.DelProxy(pxy.GetName()) ctl.svr.DelProxy(pxy.GetName())
@ -303,6 +304,7 @@ func (ctl *Control) manager() {
if time.Since(ctl.lastPing) > time.Duration(config.ServerCommonCfg.HeartBeatTimeout)*time.Second { if time.Since(ctl.lastPing) > time.Duration(config.ServerCommonCfg.HeartBeatTimeout)*time.Second {
ctl.conn.Warn("heartbeat timeout") ctl.conn.Warn("heartbeat timeout")
ctl.allShutdown.Start() ctl.allShutdown.Start()
return
} }
case rawMsg, ok := <-ctl.readCh: case rawMsg, ok := <-ctl.readCh:
if !ok { if !ok {