GuanM/hysteria-dev
1
0
Fork 0
mirror of https://github.com/cmz0228/hysteria-dev.git synced 2025-06-25 22:09:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: prevent client double close

Browse Source
This commit is contained in:
Toby 2022-11-02 19:10:03 +00:00
parent a3f53e9761
commit 4f14601896
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/transport/pktconns/udphop/client.go
View File

@ -30,6 +30,7 @@ type ObfsUDPHopClientPacketConn struct {
recvQueue chan *udpPacket recvQueue chan *udpPacket
closeChan chan struct{} closeChan chan struct{}
closed bool
bufPool sync.Pool bufPool sync.Pool
} }
@ -112,6 +113,9 @@ func (c *ObfsUDPHopClientPacketConn) hopRoutine() {
func (c *ObfsUDPHopClientPacketConn) hop() { func (c *ObfsUDPHopClientPacketConn) hop() {
c.connMutex.Lock() c.connMutex.Lock()
defer c.connMutex.Unlock() defer c.connMutex.Unlock()
if c.closed {
return
}
newConn, err := net.ListenUDP("udp", nil) newConn, err := net.ListenUDP("udp", nil)
if err != nil { if err != nil {
log.Printf("udphop: failed to listen on %s: %v", newConn.LocalAddr(), err) log.Printf("udphop: failed to listen on %s: %v", newConn.LocalAddr(), err)
@ -175,11 +179,18 @@ func (c *ObfsUDPHopClientPacketConn) WriteTo(b []byte, addr net.Addr) (int, erro
func (c *ObfsUDPHopClientPacketConn) Close() error { func (c *ObfsUDPHopClientPacketConn) Close() error {
c.connMutex.Lock() c.connMutex.Lock()
defer c.connMutex.Unlock() defer c.connMutex.Unlock()
if c.closed {
return nil
}
// Close prevConn and currentConn
// Close closeChan to unblock ReadFrom & hopRoutine
// Set closed flag to true to prevent double close
if c.prevConn != nil { if c.prevConn != nil {
_ = c.prevConn.Close() _ = c.prevConn.Close()
} }
err := c.currentConn.Close() err := c.currentConn.Close()
close(c.closeChan) close(c.closeChan)
c.closed = true
return err return err
} }