mirror of
https://github.com/apernet/hysteria.git
synced 2025-04-03 20:47:38 +03:00
feat: rework udp stuff
This commit is contained in:
Toby
parent
fd4d095dcd
commit
d4e3833641
10 changed files with 278 additions and 136 deletions
|
|
@ -9,11 +9,13 @@ require (
|
|||
github.com/mdp/qrterminal/v3 v3.1.1
|
||||
github.com/spf13/cobra v1.7.0
|
||||
github.com/spf13/viper v1.15.0
|
||||
github.com/stretchr/testify v1.8.4
|
||||
github.com/txthinking/socks5 v0.0.0-20230325130024-4230056ae301
|
||||
go.uber.org/zap v1.24.0
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/fsnotify/fsnotify v1.6.0 // indirect
|
||||
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
|
||||
github.com/golang/mock v1.6.0 // indirect
|
||||
|
|
@ -29,6 +31,7 @@ require (
|
|||
github.com/onsi/ginkgo/v2 v2.9.5 // indirect
|
||||
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
|
||||
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
github.com/quic-go/qpack v0.4.0 // indirect
|
||||
github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
|
||||
github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
|
||||
|
|
@ -37,6 +40,7 @@ require (
|
|||
github.com/spf13/cast v1.5.0 // indirect
|
||||
github.com/spf13/jwalterweatherman v1.1.0 // indirect
|
||||
github.com/spf13/pflag v1.0.5 // indirect
|
||||
github.com/stretchr/objx v0.5.0 // indirect
|
||||
github.com/subosito/gotenv v1.4.2 // indirect
|
||||
github.com/txthinking/runnergroup v0.0.0-20210608031112-152c7c4432bf // indirect
|
||||
go.uber.org/atomic v1.11.0 // indirect
|
||||
|
|
|
|||
|
|
@ -162,6 +162,7 @@ github.com/miekg/dns v1.1.51 h1:0+Xg7vObnhrz/4ZCZcZh7zPXlmU0aveS2HDBd0m0qSo=
|
|||
github.com/miekg/dns v1.1.51/go.mod h1:2Z9d3CP1LQWihRZUf29mQ19yDThaI4DAYzte2CaQW5c=
|
||||
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
|
||||
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
|
||||
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
|
||||
github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
|
||||
github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
|
||||
github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
|
||||
|
|
@ -199,6 +200,7 @@ github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU=
|
|||
github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
|
||||
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
||||
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
|
|
@ -208,8 +210,9 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
|
|||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
|
||||
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
|
||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||
github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
|
||||
github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
|
||||
github.com/txthinking/runnergroup v0.0.0-20210608031112-152c7c4432bf h1:7PflaKRtU4np/epFxRXlFhlzLXZzKFrH5/I4so5Ove0=
|
||||
|
|
@ -231,8 +234,8 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
|
|||
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
|
||||
go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
|
||||
go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
|
||||
go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
|
||||
go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
|
||||
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
|
||||
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
|
||||
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
|
||||
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
|
||||
|
|
@ -555,8 +558,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
|
|||
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
|
||||
google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
|
||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
|
||||
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
|
||||
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
|
||||
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
|
||||
|
|
|
|||
|
|
@ -12,14 +12,61 @@ import (
|
|||
const (
|
||||
udpBufferSize = 4096
|
||||
|
||||
defaultTimeout = 5 * time.Minute
|
||||
defaultTimeout = 60 * time.Second
|
||||
idleCleanupInterval = 1 * time.Second
|
||||
)
|
||||
|
||||
type atomicTime struct {
|
||||
v atomic.Value
|
||||
}
|
||||
|
||||
func newAtomicTime(t time.Time) *atomicTime {
|
||||
a := &atomicTime{}
|
||||
a.Set(t)
|
||||
return a
|
||||
}
|
||||
|
||||
func (t *atomicTime) Set(new time.Time) {
|
||||
t.v.Store(new)
|
||||
}
|
||||
|
||||
func (t *atomicTime) Get() time.Time {
|
||||
return t.v.Load().(time.Time)
|
||||
}
|
||||
|
||||
type sessionEntry struct {
|
||||
HyConn client.HyUDPConn
|
||||
Last *atomicTime
|
||||
Timeout bool // true if the session is closed due to timeout
|
||||
}
|
||||
|
||||
func (e *sessionEntry) Feed(data []byte, addr string) error {
|
||||
e.Last.Set(time.Now())
|
||||
return e.HyConn.Send(data, addr)
|
||||
}
|
||||
|
||||
func (e *sessionEntry) ReceiveLoop(pc net.PacketConn, addr net.Addr) error {
|
||||
for {
|
||||
data, _, err := e.HyConn.Receive()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = pc.WriteTo(data, addr)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
e.Last.Set(time.Now())
|
||||
}
|
||||
}
|
||||
|
||||
type UDPTunnel struct {
|
||||
HyClient client.Client
|
||||
Remote string
|
||||
Timeout time.Duration
|
||||
EventLogger UDPEventLogger
|
||||
|
||||
m map[string]*sessionEntry // addr -> HyConn
|
||||
mutex sync.RWMutex
|
||||
}
|
||||
|
||||
type UDPEventLogger interface {
|
||||
|
|
@ -27,94 +74,64 @@ type UDPEventLogger interface {
|
|||
Error(addr net.Addr, err error)
|
||||
}
|
||||
|
||||
type sessionEntry struct {
|
||||
HyConn client.HyUDPConn
|
||||
Deadline atomic.Value
|
||||
}
|
||||
func (t *UDPTunnel) Serve(pc net.PacketConn) error {
|
||||
stopCh := make(chan struct{})
|
||||
go t.idleCleanupLoop(stopCh)
|
||||
defer close(stopCh)
|
||||
defer t.cleanup(false)
|
||||
|
||||
type sessionManager struct {
|
||||
SessionMap map[string]*sessionEntry
|
||||
Timeout time.Duration
|
||||
TimeoutFunc func(addr net.Addr)
|
||||
Mutex sync.RWMutex
|
||||
}
|
||||
|
||||
func (sm *sessionManager) New(addr net.Addr, hyConn client.HyUDPConn) {
|
||||
entry := &sessionEntry{
|
||||
HyConn: hyConn,
|
||||
}
|
||||
entry.Deadline.Store(time.Now().Add(sm.Timeout))
|
||||
|
||||
// Timeout cleanup routine
|
||||
go func() {
|
||||
for {
|
||||
ttl := entry.Deadline.Load().(time.Time).Sub(time.Now())
|
||||
if ttl <= 0 {
|
||||
// Inactive for too long, close the session
|
||||
sm.Mutex.Lock()
|
||||
delete(sm.SessionMap, addr.String())
|
||||
sm.Mutex.Unlock()
|
||||
_ = hyConn.Close()
|
||||
if sm.TimeoutFunc != nil {
|
||||
sm.TimeoutFunc(addr)
|
||||
}
|
||||
return
|
||||
} else {
|
||||
time.Sleep(ttl)
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
sm.Mutex.Lock()
|
||||
defer sm.Mutex.Unlock()
|
||||
sm.SessionMap[addr.String()] = entry
|
||||
}
|
||||
|
||||
func (sm *sessionManager) Get(addr net.Addr) client.HyUDPConn {
|
||||
sm.Mutex.RLock()
|
||||
defer sm.Mutex.RUnlock()
|
||||
if entry, ok := sm.SessionMap[addr.String()]; ok {
|
||||
return entry.HyConn
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func (sm *sessionManager) Renew(addr net.Addr) {
|
||||
sm.Mutex.RLock() // RLock is enough as we are not modifying the map itself, only a value in the entry
|
||||
defer sm.Mutex.RUnlock()
|
||||
if entry, ok := sm.SessionMap[addr.String()]; ok {
|
||||
entry.Deadline.Store(time.Now().Add(sm.Timeout))
|
||||
}
|
||||
}
|
||||
|
||||
func (t *UDPTunnel) Serve(listener net.PacketConn) error {
|
||||
sm := &sessionManager{
|
||||
SessionMap: make(map[string]*sessionEntry),
|
||||
Timeout: t.Timeout,
|
||||
TimeoutFunc: func(addr net.Addr) { t.EventLogger.Error(addr, nil) },
|
||||
}
|
||||
if sm.Timeout <= 0 {
|
||||
sm.Timeout = defaultTimeout
|
||||
}
|
||||
t.m = make(map[string]*sessionEntry)
|
||||
buf := make([]byte, udpBufferSize)
|
||||
for {
|
||||
n, addr, err := listener.ReadFrom(buf)
|
||||
n, addr, err := pc.ReadFrom(buf)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
t.handle(listener, sm, addr, buf[:n])
|
||||
t.feed(pc, addr, buf[:n])
|
||||
}
|
||||
}
|
||||
|
||||
func (t *UDPTunnel) handle(l net.PacketConn, sm *sessionManager, addr net.Addr, data []byte) {
|
||||
hyConn := sm.Get(addr)
|
||||
if hyConn != nil {
|
||||
// Existing session
|
||||
_ = hyConn.Send(data, t.Remote)
|
||||
sm.Renew(addr)
|
||||
} else {
|
||||
// New session
|
||||
func (t *UDPTunnel) idleCleanupLoop(stopCh <-chan struct{}) {
|
||||
ticker := time.NewTicker(idleCleanupInterval)
|
||||
defer ticker.Stop()
|
||||
for {
|
||||
select {
|
||||
case <-ticker.C:
|
||||
t.cleanup(true)
|
||||
case <-stopCh:
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (t *UDPTunnel) cleanup(idleOnly bool) {
|
||||
// We use RLock here as we are only scanning the map, not deleting from it.
|
||||
t.mutex.RLock()
|
||||
defer t.mutex.RUnlock()
|
||||
|
||||
timeout := t.Timeout
|
||||
if timeout == 0 {
|
||||
timeout = defaultTimeout
|
||||
}
|
||||
|
||||
now := time.Now()
|
||||
for _, entry := range t.m {
|
||||
if !idleOnly || now.Sub(entry.Last.Get()) > timeout {
|
||||
entry.Timeout = true
|
||||
_ = entry.HyConn.Close()
|
||||
// Closing the connection here will cause the ReceiveLoop to exit,
|
||||
// and the session will be removed from the map there.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (t *UDPTunnel) feed(pc net.PacketConn, addr net.Addr, data []byte) {
|
||||
t.mutex.RLock()
|
||||
entry := t.m[addr.String()]
|
||||
t.mutex.RUnlock()
|
||||
|
||||
// Create a new session if not exists
|
||||
if entry == nil {
|
||||
if t.EventLogger != nil {
|
||||
t.EventLogger.Connect(addr)
|
||||
}
|
||||
|
|
@ -125,22 +142,38 @@ func (t *UDPTunnel) handle(l net.PacketConn, sm *sessionManager, addr net.Addr,
|
|||
}
|
||||
return
|
||||
}
|
||||
sm.New(addr, hyConn)
|
||||
_ = hyConn.Send(data, t.Remote)
|
||||
|
||||
// Local <- Remote routine
|
||||
entry = &sessionEntry{
|
||||
HyConn: hyConn,
|
||||
Last: newAtomicTime(time.Now()),
|
||||
}
|
||||
// Start the receive loop for this session
|
||||
// Local <- Remote
|
||||
go func() {
|
||||
for {
|
||||
data, _, err := hyConn.Receive()
|
||||
if err != nil {
|
||||
return
|
||||
err := entry.ReceiveLoop(pc, addr)
|
||||
if !entry.Timeout {
|
||||
_ = hyConn.Close()
|
||||
if t.EventLogger != nil {
|
||||
t.EventLogger.Error(addr, err)
|
||||
}
|
||||
_, err = l.WriteTo(data, addr)
|
||||
if err != nil {
|
||||
return
|
||||
} else {
|
||||
// Connection already closed by timeout cleanup,
|
||||
// no need to close again here.
|
||||
// Use nil error to indicate timeout.
|
||||
if t.EventLogger != nil {
|
||||
t.EventLogger.Error(addr, nil)
|
||||
}
|
||||
sm.Renew(addr)
|
||||
}
|
||||
// Remove the session from the map
|
||||
t.mutex.Lock()
|
||||
delete(t.m, addr.String())
|
||||
t.mutex.Unlock()
|
||||
}()
|
||||
// Insert the session into the map
|
||||
t.mutex.Lock()
|
||||
t.m[addr.String()] = entry
|
||||
t.mutex.Unlock()
|
||||
}
|
||||
|
||||
// Feed the message to the session
|
||||
_ = entry.Feed(data, t.Remote)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue