@@ -193,24 +193,20 @@ type Dialer struct {
193193func (d * Dialer )negotiate (ctx context.Context ) (err error ) {
194194var (
195195decoder = json .NewDecoder (d .conn )
196- errCh = make (chan error )
196+ errCh = make (chan error , 1 )
197197// If candidates are sent before an offer, we place them here.
198198// We currently have no assurances to ensure this can't happen,
199199// so it's better to buffer and process than fail.
200200pendingCandidates = []webrtc.ICECandidateInit {}
201201)
202202go func () {
203203defer close (errCh )
204- defer func () {
205- _ = d .conn .Close ()
206- }()
204+ defer func () {_ = d .conn .Close () }()
207205
208206err := waitForConnectionOpen (context .Background (),d .rtc )
209207if err != nil {
210208d .log .Debug (ctx ,"negotiation error" ,slog .Error (err ))
211- if errors .Is (err ,context .DeadlineExceeded ) {
212- _ = d .conn .Close ()
213- }
209+
214210errCh <- fmt .Errorf ("wait for connection to open: %w" ,err )
215211return
216212}
@@ -331,23 +327,28 @@ func (d *Dialer) Ping(ctx context.Context) error {
331327return err
332328}
333329}
330+
334331d .pingMut .Lock ()
335332defer d .pingMut .Unlock ()
333+
336334d .log .Debug (ctx ,"sending ping" )
337335_ ,err = d .ctrlrw .Write ([]byte {'a' })
338336if err != nil {
339337return fmt .Errorf ("write: %w" ,err )
340338}
341- errCh := make (chan error )
339+
340+ errCh := make (chan error ,1 )
342341go func () {
343342// There's a race in which connections can get lost-mid ping
344343// in which case this would block forever.
345344defer close (errCh )
346345_ ,err = d .ctrlrw .Read (make ([]byte ,4 ))
347346errCh <- err
348347}()
349- ctx ,cancelFunc := context .WithTimeout (ctx ,time .Second * 15 )
350- defer cancelFunc ()
348+
349+ ctx ,cancel := context .WithTimeout (ctx ,time .Second * 15 )
350+ defer cancel ()
351+
351352select {
352353case err := <- errCh :
353354return err