Revert "Run ops.GracefulClose earlier in pc.Close"

edaniels · edaniels · commit 48a2e5a0cc87 · 2024-08-14T14:36:04.000-04:00
This reverts commit ec6b6f1.
diff --git a/peerconnection.go b/peerconnection.go
@@ -2123,7 +2123,6 @@ func (pc *PeerConnection) close(shouldGracefullyClose bool) error {
 	}
 	if shouldGracefullyClose && !alreadyGracefullyClosed {
 		defer close(pc.isGracefulClosedDone)
-		pc.ops.GracefulClose()
 	}
 
 	// https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-close (step #3)
@@ -2180,6 +2179,8 @@ func (pc *PeerConnection) close(shouldGracefullyClose bool) error {
 	pc.updateConnectionState(pc.ICEConnectionState(), pc.dtlsTransport.State())
 
 	if shouldGracefullyClose {
+		pc.ops.GracefulClose()
+
 		// note that it isn't canon to stop gracefully
 		pc.sctpTransport.lock.Lock()
 		for _, d := range pc.sctpTransport.dataChannels {

Original file line number	Diff line number	Diff line change
`@@ -2123,7 +2123,6 @@ func (pc *PeerConnection) close(shouldGracefullyClose bool) error {`
`2123`	`2123`	`}`
`2124`	`2124`	`if shouldGracefullyClose && !alreadyGracefullyClosed {`
`2125`	`2125`	`defer close(pc.isGracefulClosedDone)`
`2126`		`- pc.ops.GracefulClose()`
`2127`	`2126`	`}`
`2128`	`2127`
`2129`	`2128`	`// https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-close (step #3)`
`@@ -2180,6 +2179,8 @@ func (pc *PeerConnection) close(shouldGracefullyClose bool) error {`
`2180`	`2179`	`pc.updateConnectionState(pc.ICEConnectionState(), pc.dtlsTransport.State())`
`2181`	`2180`
`2182`	`2181`	`if shouldGracefullyClose {`
	`2182`	`+ pc.ops.GracefulClose()`
	`2183`	`+`
`2183`	`2184`	`// note that it isn't canon to stop gracefully`
`2184`	`2185`	`pc.sctpTransport.lock.Lock()`
`2185`	`2186`	`for _, d := range pc.sctpTransport.dataChannels {`