Skip to content

remove unused addr and retry #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jxx-gg merged 2 commits into from
Sep 27, 2021
Merged

remove unused addr and retry #41

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df3d45a
remove unused addr
jxx-gg Sep 27, 2021
6dc044d
remove unncessary retry
jxx-gg Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 6 additions & 24 deletions tunnel/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,31 +46,13 @@ func (tc *Conn) SetReadDeadline(t time.Time) error { return nil }
// SetWriteDeadline is trivial implementation, in order to match interface net.Conn.
func (tc *Conn) SetWriteDeadline(t time.Time) error { return nil }

// ServerConn (re-)tries and returns a tunnel connection.
func ServerConn(ctx context.Context, ts *Server, addr string, target *Target) (*Conn, error) {
bo := backoff.NewExponentialBackOff()
bo.MaxElapsedTime = 0 // Retry Subscribe indefinitely.
bo.InitialInterval = RetryBaseDelay
bo.MaxInterval = RetryMaxDelay
bo.RandomizationFactor = RetryRandomization

for {
session, err := ts.NewSession(ctx, ServerSession{Target: *target})
if err == nil {
return &Conn{session}, nil
}
duration := bo.NextBackOff()
log.Printf("Failed to get tunnel connection: %v.\nRetrying in %s.", err, duration)
time.Sleep(duration)

select {
case <-ctx.Done():
return nil, ctx.Err()
default:
}

// ServerConn returns a tunnel connection.
func ServerConn(ctx context.Context, ts *Server, target *Target) (*Conn, error) {
session, err := ts.NewSession(ctx, ServerSession{Target: *target})
if err == nil {
return &Conn{session}, nil
}

return nil, err
}

func registerTunnelClient(ctx context.Context, addr string, cert string, l *Listener,
Expand Down