Commit177839f

committed

Ensure rtc conn is closed on error (#438)

(cherry picked from commita778c5f)(cherry picked from commit677577f)

1 parent2954cab commit177839fCopy full SHA for 177839f

File tree

+11

-2

lines changed

+11

-2

lines changed

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import (`
`14`	`14`	`"github.com/pion/datachannel"`
`15`	`15`	`"github.com/pion/webrtc/v3"`
`16`	`16`	`"golang.org/x/net/proxy"`
	`17`	`+"golang.org/x/xerrors"`
`17`	`18`	`"nhooyr.io/websocket"`
`18`	`19`
`19`	`20`	`"cdr.dev/slog"`
`@@ -111,6 +112,11 @@ func Dial(ctx context.Context, conn net.Conn, options DialOptions) (Dialer, er`
`111`	`112`	`iceServers:rtc.GetConfiguration().ICEServers,`
`112`	`113`	`rtc:rtc.ConnectionState(),`
`113`	`114`	`}`
	`115`	`+`
	`116`	`+closeErr:=rtc.Close()`
	`117`	`+ifcloseErr!=nil {`
	`118`	`+log.Warn(context.Background(),"close rtc connection on dial failure",slog.Error(closeErr))`
	`119`	`+}`
`114`	`120`	`}`
`115`	`121`	`}()`
`116`	`122`
`@@ -169,9 +175,12 @@ func Dial(ctx context.Context, conn net.Conn, options DialOptions) (Dialer, er`
`169`	`175`	`connClosers: []io.Closer{ctrl},`
`170`	`176`	`}`
`171`	`177`
`172`		`-// This is on a separate line so the defer above catches it.`
`173`	`178`	`err=dialer.negotiate(ctx)`
`174`		`-returndialer,err`
	`179`	`+iferr!=nil {`
	`180`	`+returnnil,xerrors.Errorf("negotiate rtc connection: %w",err)`
	`181`	`+}`
	`182`	`+`
	`183`	`+returndialer,nil`
`175`	`184`	`}`
`176`	`185`
`177`	`186`	`// Dialer enables arbitrary dialing to any network and address`

Comments

(0)