From 2d3a4faee2927226bce73709aba44c04abd7e727 Mon Sep 17 00:00:00 2001 From: Eric Daniels Date: Fri, 2 Aug 2024 19:09:36 -0400 Subject: [PATCH] p2 --- datachannel.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/datachannel.go b/datachannel.go index 317420b326b..91591f8b847 100644 --- a/datachannel.go +++ b/datachannel.go @@ -41,7 +41,7 @@ type DataChannel struct { bufferedAmountLowThreshold uint64 detachCalled bool readLoopActive chan struct{} - isUserClosed bool + isGracefulClosed bool // The binaryType represents attribute MUST, on getting, return the value to // which it was last set. On setting, if the new value is either the string @@ -227,7 +227,7 @@ func (d *DataChannel) OnOpen(f func()) { func (d *DataChannel) onOpen() { d.mu.RLock() handler := d.onOpenHandler - if d.isUserClosed { + if d.isGracefulClosed { d.mu.RUnlock() return } @@ -258,7 +258,7 @@ func (d *DataChannel) OnDial(f func()) { func (d *DataChannel) onDial() { d.mu.RLock() handler := d.onDialHandler - if d.isUserClosed { + if d.isGracefulClosed { d.mu.RUnlock() return } @@ -306,7 +306,7 @@ func (d *DataChannel) OnMessage(f func(msg DataChannelMessage)) { func (d *DataChannel) onMessage(msg DataChannelMessage) { d.mu.RLock() handler := d.onMessageHandler - if d.isUserClosed { + if d.isGracefulClosed { d.mu.RUnlock() return } @@ -320,7 +320,7 @@ func (d *DataChannel) onMessage(msg DataChannelMessage) { func (d *DataChannel) handleOpen(dc *datachannel.DataChannel, isRemote, isAlreadyNegotiated bool) { d.mu.Lock() - if d.isUserClosed { + if d.isGracefulClosed { d.mu.Unlock() return } @@ -348,7 +348,7 @@ func (d *DataChannel) handleOpen(dc *datachannel.DataChannel, isRemote, isAlread d.mu.Lock() defer d.mu.Unlock() - if d.isUserClosed { + if d.isGracefulClosed { return } @@ -369,7 +369,7 @@ func (d *DataChannel) OnError(f func(err error)) { func (d *DataChannel) onError(err error) { d.mu.RLock() handler := d.onErrorHandler - if d.isUserClosed { + if d.isGracefulClosed { d.mu.RUnlock() return } @@ -505,7 +505,7 @@ func (d *DataChannel) GracefulClose() error { // right before closing the DataChannel, you'd need never see a reset stream. func (d *DataChannel) close(graceful bool) error { d.mu.Lock() - d.isUserClosed = true + d.isGracefulClosed = true readLoopActive := d.readLoopActive if graceful && readLoopActive != nil { defer func() {