Commita778c5f

authored

Ensure rtc conn is closed on error (#438)

1 parent4c89550 commita778c5fCopy full SHA for a778c5f

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"`
`@@ -112,6 +113,11 @@ func Dial(ctx context.Context, conn net.Conn, options DialOptions) (Dialer, er`
`112`	`113`	`iceServers:rtc.GetConfiguration().ICEServers,`
`113`	`114`	`rtc:rtc.ConnectionState(),`
`114`	`115`	`}`
	`116`	`+`
	`117`	`+closeErr:=rtc.Close()`
	`118`	`+ifcloseErr!=nil {`
	`119`	`+log.Warn(context.Background(),"close rtc connection on dial failure",slog.Error(closeErr))`
	`120`	`+}`
`115`	`121`	`}`
`116`	`122`	`}()`
`117`	`123`
`@@ -170,9 +176,12 @@ func Dial(ctx context.Context, conn net.Conn, options DialOptions) (Dialer, er`
`170`	`176`	`connClosers: []io.Closer{ctrl},`
`171`	`177`	`}`
`172`	`178`
`173`		`-// This is on a separate line so the defer above catches it.`
`174`	`179`	`err=dialer.negotiate(ctx)`
`175`		`-returndialer,err`
	`180`	`+iferr!=nil {`
	`181`	`+returnnil,xerrors.Errorf("negotiate rtc connection: %w",err)`
	`182`	`+}`
	`183`	`+`
	`184`	`+returndialer,nil`
`176`	`185`	`}`
`177`	`186`
`178`	`187`	`// Dialer enables arbitrary dialing to any network and address`

Comments

(0)