From 0d1f76d584a3adfe3390213db0eea680379d3218 Mon Sep 17 00:00:00 2001 From: Dean Sheather Date: Thu, 9 Sep 2021 23:58:08 +0000 Subject: [PATCH] Ebnsure rtc conn is closed on error --- wsnet/dial.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/wsnet/dial.go b/wsnet/dial.go index 53b4a186..7f00a128 100644 --- a/wsnet/dial.go +++ b/wsnet/dial.go @@ -14,6 +14,7 @@ import ( "github.com/pion/datachannel" "github.com/pion/webrtc/v3" "golang.org/x/net/proxy" + "golang.org/x/xerrors" "nhooyr.io/websocket" "cdr.dev/slog" @@ -112,6 +113,11 @@ func Dial(ctx context.Context, conn net.Conn, options *DialOptions) (*Dialer, er iceServers: rtc.GetConfiguration().ICEServers, rtc: rtc.ConnectionState(), } + + closeErr := rtc.Close() + if closeErr != nil { + log.Warn(context.Background(), "close rtc connection on dial failure", slog.Error(closeErr)) + } } }() @@ -170,9 +176,12 @@ func Dial(ctx context.Context, conn net.Conn, options *DialOptions) (*Dialer, er connClosers: []io.Closer{ctrl}, } - // This is on a separate line so the defer above catches it. err = dialer.negotiate(ctx) - return dialer, err + if err != nil { + return nil, xerrors.Errorf("negotiate rtc connection: %w", err) + } + + return dialer, nil } // Dialer enables arbitrary dialing to any network and address pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy