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

edaniels · edaniels · commit a49914b2536b · 2024-08-14T14:36:23.000-04:00
This reverts commit 887b10f.
diff --git a/peerconnection.go b/peerconnection.go
@@ -2113,7 +2113,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)
@@ -2170,6 +2169,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
`@@ -2113,7 +2113,6 @@ func (pc *PeerConnection) close(shouldGracefullyClose bool) error {`
`2113`	`2113`	`}`
`2114`	`2114`	`if shouldGracefullyClose && !alreadyGracefullyClosed {`
`2115`	`2115`	`defer close(pc.isGracefulClosedDone)`
`2116`		`- pc.ops.GracefulClose()`
`2117`	`2116`	`}`
`2118`	`2117`
`2119`	`2118`	`// https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-close (step #3)`
`@@ -2170,6 +2169,8 @@ func (pc *PeerConnection) close(shouldGracefullyClose bool) error {`
`2170`	`2169`	`pc.updateConnectionState(pc.ICEConnectionState(), pc.dtlsTransport.State())`
`2171`	`2170`
`2172`	`2171`	`if shouldGracefullyClose {`
	`2172`	`+ pc.ops.GracefulClose()`
	`2173`	`+`
`2173`	`2174`	`// note that it isn't canon to stop gracefully`
`2174`	`2175`	`pc.sctpTransport.lock.Lock()`
`2175`	`2176`	`for _, d := range pc.sctpTransport.dataChannels {`