fix: ensure error chan is buffered in (*Dialer).negotiate (#437)

coadler · deansheather · commit 2954cab16bb3 · 2021-09-13T22:22:01.000Z
(cherry picked from commit 4c89550) (cherry picked from commit cb15635)
diff --git a/wsnet/dial.go b/wsnet/dial.go
@@ -192,24 +192,20 @@ type Dialer struct {
 func (d *Dialer) negotiate(ctx context.Context) (err error) {
 	var (
 		decoder = json.NewDecoder(d.conn)
-		errCh   = make(chan error)
+		errCh   = make(chan error, 1)
 		// If candidates are sent before an offer, we place them here.
 		// We currently have no assurances to ensure this can't happen,
 		// so it's better to buffer and process than fail.
 		pendingCandidates = []webrtc.ICECandidateInit{}
 	)
 	go func() {
 		defer close(errCh)
-		defer func() {
-			_ = d.conn.Close()
-		}()
+		defer func() { _ = d.conn.Close() }()
 
 		err := waitForConnectionOpen(context.Background(), d.rtc)
 		if err != nil {
 			d.log.Debug(ctx, "negotiation error", slog.Error(err))
-			if errors.Is(err, context.DeadlineExceeded) {
-				_ = d.conn.Close()
-			}
+
 			errCh <- fmt.Errorf("wait for connection to open: %w", err)
 			return
 		}
@@ -325,23 +321,28 @@ func (d *Dialer) Ping(ctx context.Context) error {
 			return err
 		}
 	}
+
 	d.pingMut.Lock()
 	defer d.pingMut.Unlock()
+
 	d.log.Debug(ctx, "sending ping")
 	_, err = d.ctrlrw.Write([]byte{'a'})
 	if err != nil {
 		return fmt.Errorf("write: %w", err)
 	}
-	errCh := make(chan error)
+
+	errCh := make(chan error, 1)
 	go func() {
 		// There's a race in which connections can get lost-mid ping
 		// in which case this would block forever.
 		defer close(errCh)
 		_, err = d.ctrlrw.Read(make([]byte, 4))
 		errCh <- err
 	}()
-	ctx, cancelFunc := context.WithTimeout(ctx, time.Second*15)
-	defer cancelFunc()
+
+	ctx, cancel := context.WithTimeout(ctx, time.Second*15)
+	defer cancel()
+
 	select {
 	case err := <-errCh:
 		return err
