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: code improvements

Browse source
This commit is contained in:
Toby 2024-01-26 13:19:02 -08:00
parent 84b54eb702
commit ae402d9d91
1 changed files with 24 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

51
core/client/reconnect.go
View file

@ -56,7 +56,11 @@ func (rc *reconnectableClientImpl) reconnect() error {
} }
} }
func (rc *reconnectableClientImpl) TCP(addr string) (net.Conn, error) { // clientDo calls f with the current client.
// If the client is nil, it will first reconnect.
// It will also detect if the client is closed, and if so,
// set it to nil for reconnect next time.
func (rc *reconnectableClientImpl) clientDo(f func(Client) (interface{}, error)) (interface{}, error) {
rc.m.Lock() rc.m.Lock()
if rc.closed { if rc.closed {
rc.m.Unlock() rc.m.Unlock()
@ -72,46 +76,37 @@ func (rc *reconnectableClientImpl) TCP(addr string) (net.Conn, error) {
client := rc.client client := rc.client
rc.m.Unlock() rc.m.Unlock()
conn, err := client.TCP(addr) ret, err := f(client)
if _, ok := err.(coreErrs.ClosedError); ok { if _, ok := err.(coreErrs.ClosedError); ok {
// Connection closed, set client to nil for reconnect next time // Connection closed, set client to nil for reconnect next time
rc.m.Lock() rc.m.Lock()
// In case the client has already been reconnected by another goroutine
if rc.client == client { if rc.client == client {
// This check is in case the client is already changed by another goroutine
rc.client = nil rc.client = nil
} }
rc.m.Unlock() rc.m.Unlock()
} }
return conn, err return ret, err
}
func (rc *reconnectableClientImpl) TCP(addr string) (net.Conn, error) {
if c, err := rc.clientDo(func(client Client) (interface{}, error) {
return client.TCP(addr)
}); err != nil {
return nil, err
} else {
return c.(net.Conn), nil
}
} }
func (rc *reconnectableClientImpl) UDP() (HyUDPConn, error) { func (rc *reconnectableClientImpl) UDP() (HyUDPConn, error) {
rc.m.Lock() if c, err := rc.clientDo(func(client Client) (interface{}, error) {
if rc.closed { return client.UDP()
rc.m.Unlock() }); err != nil {
return nil, coreErrs.ClosedError{}
}
if rc.client == nil {
// No active connection, connect first
if err := rc.reconnect(); err != nil {
rc.m.Unlock()
return nil, err return nil, err
} else {
return c.(HyUDPConn), nil
} }
}
client := rc.client
rc.m.Unlock()
conn, err := client.UDP()
if _, ok := err.(coreErrs.ClosedError); ok {
// Connection closed, set client to nil for reconnect next time
rc.m.Lock()
// In case the client has already been reconnected by another goroutine
if rc.client == client {
rc.client = nil
}
rc.m.Unlock()
}
return conn, err
} }
func (rc *reconnectableClientImpl) Close() error { func (rc *reconnectableClientImpl) Close() error {