purgatory/Clash.Meta
1
0
Fork 0
mirror of https://github.com/MetaCubeX/Clash.Meta.git synced 2025-04-20 01:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove chan

Browse source
This commit is contained in:
keakon 2024-01-26 14:57:12 +08:00
parent c7bb638ecb
commit 21b9bb98a6
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
transport/hysteria2/extras/transport/udphop/conn.go
View file

@ -19,8 +19,7 @@ type udpHopPacketConn struct {
conn net.PacketConn
addrIndex int
closeChan chan struct{}
closed bool
closed bool
}
type udpPacket struct {
@ -50,7 +49,6 @@ func NewUDPHopPacketConn(addr *UDPHopAddr, hopInterval time.Duration) (net.Packe
HopInterval: hopInterval,
conn: conn,
addrIndex: index,
closeChan: make(chan struct{}),
}
go hConn.hopLoop()
return hConn, nil
@ -62,19 +60,20 @@ func (u *udpHopPacketConn) hopLoop() {
for {
select {
case <-ticker.C:
u.hop()
case <-u.closeChan:
return
if u.hop() {
return
}
}
}
}
func (u *udpHopPacketConn) hop() {
func (u *udpHopPacketConn) hop() bool {
if u.closed {
return
return true
}
u.addrIndex = rand.Intn(len(u.Addrs))
log.Infoln("hopped to %s", u.Addrs[u.addrIndex])
return false
}
func (u *udpHopPacketConn) ReadFrom(b []byte) (n int, addr net.Addr, err error) {
@ -93,7 +92,6 @@ func (u *udpHopPacketConn) Close() error {
return nil
}
err := u.conn.Close()
close(u.closeChan)
u.closed = true
u.Addrs = nil // For GC
return err