Skip to content
This repository has been archived by the owner on Sep 9, 2022. It is now read-only.

fix: don't abort accept when accepting a single connection fails #107

Merged
merged 1 commit into from
Apr 26, 2020
Merged
Changes from all commits
Commits
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
32 changes: 17 additions & 15 deletions listen.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,24 @@ func (r *Relay) Listener() *RelayListener {
}

func (l *RelayListener) Accept() (manet.Conn, error) {
select {
case c := <-l.incoming:
err := l.Relay().writeResponse(c.stream, pb.CircuitRelay_SUCCESS)
if err != nil {
log.Debugf("error writing relay response: %s", err.Error())
c.stream.Reset()
return nil, err
for {
select {
case c := <-l.incoming:
err := l.Relay().writeResponse(c.stream, pb.CircuitRelay_SUCCESS)
if err != nil {
log.Debugf("error writing relay response: %s", err.Error())
c.stream.Reset()
continue
}

// TODO: Pretty print.
log.Infof("accepted relay connection: %q", c)

c.tagHop()
return c, nil
case <-l.ctx.Done():
return nil, l.ctx.Err()
}

// TODO: Pretty print.
log.Infof("accepted relay connection: %q", c)

c.tagHop()
return c, nil
case <-l.ctx.Done():
return nil, l.ctx.Err()
}
}

Expand Down