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

Add lazy_start option.

Browse source 
When on, the client will not attempt to connect to the server at
startup, only when a connection is initiated.
This commit is contained in:
Siyuan Ren 2022-12-30 11:55:42 +08:00
parent 1d9fa029c2
commit 604d4fc652
3 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/cmd/client.go
View file

@ -136,6 +136,7 @@ func client(config *clientConfig) {
for {
try += 1
c, err := cs.NewClient(config.Server, auth, tlsConfig, quicConfig, pktConnFunc, up, down, config.FastOpen,
config.LazyStart,
func(err error) {
if config.QuitOnDisconnect {
logrus.WithFields(logrus.Fields{
@ -170,7 +171,12 @@ func client(config *clientConfig) {
}
}
defer client.Close()
logrus.WithField("addr", config.Server).Info("Connected")
if config.LazyStart {
logrus.WithField("addr", config.Server).Info("Option lazy_start specified. Server connection deferred.")
} else {
logrus.WithField("addr", config.Server).Info("Connected")
}
// Local
errChan := make(chan error)

1
app/cmd/config.go
View file

@ -227,6 +227,7 @@ type clientConfig struct {
ReceiveWindow uint64 `json:"recv_window"`
DisableMTUDiscovery bool `json:"disable_mtu_discovery"`
FastOpen bool `json:"fast_open"`
LazyStart bool `json:"lazy_start"`
Resolver string `json:"resolver"`
ResolvePreference string `json:"resolve_preference"`
}

33
core/cs/client.go
View file

@ -49,7 +49,7 @@ type Client struct {
}
func NewClient(serverAddr string, auth []byte, tlsConfig *tls.Config, quicConfig *quic.Config,
pktConnFunc pktconns.ClientPacketConnFunc, sendBPS uint64, recvBPS uint64, fastOpen bool,
pktConnFunc pktconns.ClientPacketConnFunc, sendBPS uint64, recvBPS uint64, fastOpen bool, lazyStart bool,
quicReconnectFunc func(err error),
) (*Client, error) {
quicConfig.DisablePathMTUDiscovery = quicConfig.DisablePathMTUDiscovery || pmtud.DisablePathMTUDiscovery
@ -64,6 +64,9 @@ func NewClient(serverAddr string, auth []byte, tlsConfig *tls.Config, quicConfig
pktConnFunc: pktConnFunc,
quicReconnectFunc: quicReconnectFunc,
}
if lazyStart {
return c, nil
}
if err := c.connect(); err != nil {
return nil, err
}
@ -182,18 +185,20 @@ func (c *Client) openStreamWithReconnect() (quic.Connection, quic.Stream, error)
if c.closed {
return nil, nil, ErrClosed
}
stream, err := c.quicConn.OpenStream()
if err == nil {
// All good
return c.quicConn, &qStream{stream}, nil
}
// Something is wrong
if nErr, ok := err.(net.Error); ok && nErr.Temporary() {
// Temporary error, just return
return nil, nil, err
}
if c.quicReconnectFunc != nil {
c.quicReconnectFunc(err)
if c.quicConn != nil {
stream, err := c.quicConn.OpenStream()
if err == nil {
// All good
return c.quicConn, &qStream{stream}, nil
}
// Something is wrong
if nErr, ok := err.(net.Error); ok && nErr.Temporary() {
// Temporary error, just return
return nil, nil, err
}
if c.quicReconnectFunc != nil {
c.quicReconnectFunc(err)
}
}
// Permanent error, need to reconnect
if err := c.connect(); err != nil {
@ -201,7 +206,7 @@ func (c *Client) openStreamWithReconnect() (quic.Connection, quic.Stream, error)
return nil, nil, err
}
// We are not going to try again even if it still fails the second time
stream, err = c.quicConn.OpenStream()
stream, err := c.quicConn.OpenStream()
return c.quicConn, &qStream{stream}, err
}