mirrors/hysteria
1
0
Fork 0
mirror of https://github.com/apernet/hysteria.git synced 2025-04-04 21:17:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

chore: remove logging in udp hop, remove WriteTo addr check

Browse source
This commit is contained in:
Toby 2022-11-04 13:37:08 -07:00
parent 325869bdb5
commit d72866d61e
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
pkg/transport/pktconns/udp/hop.go
View file

@ -1,7 +1,6 @@
package udp package udp
import ( import (
"log"
"math/rand" "math/rand"
"net" "net"
"strconv" "strconv"
@ -69,7 +68,6 @@ func NewObfsUDPHopClientPacketConn(server string, hopInterval time.Duration, obf
IP: ip.IP, IP: ip.IP,
Port: int(port), Port: int(port),
} }
log.Printf("udphop: server address %s", serverAddrs[i])
} }
hopAddr := udpHopAddr(server) hopAddr := udpHopAddr(server)
conn := &ObfsUDPHopClientPacketConn{ conn := &ObfsUDPHopClientPacketConn{
@ -105,13 +103,12 @@ func (c *ObfsUDPHopClientPacketConn) recvRoutine(conn net.PacketConn) {
buf := c.bufPool.Get().([]byte) buf := c.bufPool.Get().([]byte)
n, addr, err := conn.ReadFrom(buf) n, addr, err := conn.ReadFrom(buf)
if err != nil { if err != nil {
log.Printf("udphop: read error (local %s): %v", conn.LocalAddr(), err)
return return
} }
select { select {
case c.recvQueue <- &udpPacket{buf, n, addr}: case c.recvQueue <- &udpPacket{buf, n, addr}:
default: default:
log.Printf("udphop: recv queue full, dropping packet from %s", addr) // Drop the packet if the queue is full
c.bufPool.Put(buf) c.bufPool.Put(buf)
} }
} }
@ -138,7 +135,7 @@ func (c *ObfsUDPHopClientPacketConn) hop() {
} }
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) // Skip this hop if failed to listen
return return
} }
// Close prevConn, // Close prevConn,
@ -160,7 +157,6 @@ func (c *ObfsUDPHopClientPacketConn) hop() {
} }
go c.recvRoutine(c.currentConn) go c.recvRoutine(c.currentConn)
c.addrIndex = rand.Intn(len(c.serverAddrs)) c.addrIndex = rand.Intn(len(c.serverAddrs))
log.Printf("udphop: hopping to %s", c.serverAddrs[c.addrIndex])
} }
func (c *ObfsUDPHopClientPacketConn) ReadFrom(b []byte) (int, net.Addr, error) { func (c *ObfsUDPHopClientPacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
@ -196,11 +192,13 @@ func (c *ObfsUDPHopClientPacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
func (c *ObfsUDPHopClientPacketConn) WriteTo(b []byte, addr net.Addr) (int, error) { func (c *ObfsUDPHopClientPacketConn) WriteTo(b []byte, addr net.Addr) (int, error) {
c.connMutex.RLock() c.connMutex.RLock()
defer c.connMutex.RUnlock() defer c.connMutex.RUnlock()
// Check if the address is the server address /*
if addr.String() != c.serverAddr.String() { // Check if the address is the server address
log.Printf("udphop: invalid write address %s", addr) if addr.String() != c.serverAddr.String() {
return 0, net.ErrWriteToConnected return 0, net.ErrWriteToConnected
} }
*/
// Skip the check for now, always write to the server
return c.currentConn.WriteTo(b, c.serverAddrs[c.addrIndex]) return c.currentConn.WriteTo(b, c.serverAddrs[c.addrIndex])
} }