Allow multiple agent.Close

pion · Aug 6, 2024 · 1f41061 · 1f41061
1 parent dd25059
commit 1f41061
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/agent.go b/agent.go
@@ -7,6 +7,7 @@ package ice
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"math"
 	"net"
@@ -927,6 +928,9 @@ func (a *Agent) GracefulClose() error {
 
 func (a *Agent) close(graceful bool) error {
 	if err := a.ok(); err != nil {
+		if errors.Is(err, ErrClosed) {
+			return nil
+		}
 		return err
 	}
 

diff --git a/agent_test.go b/agent_test.go
@@ -1847,7 +1847,6 @@ func TestAgentGracefulCloseDeadlock(t *testing.T) {
 	closeNow.Done()
 	closed.Wait()
 
-	// already closed
-	require.Error(t, aAgent.Close())
-	require.Error(t, bAgent.Close())
+	require.NoError(t, aAgent.Close())
+	require.NoError(t, bAgent.Close())
 }