webrtc: fix rcmgr OpenConnection call claiming that it uses a fd

libp2p · Jun 13, 2023 · 2aa6e81 · 2aa6e81
1 parent affee88
commit 2aa6e81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/p2p/test/transport/rcmgr_test.go b/p2p/test/transport/rcmgr_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	gomock "github.com/golang/mock/gomock"
+	"github.com/golang/mock/gomock"
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/libp2p/go-libp2p/core/network"
 	mocknetwork "github.com/libp2p/go-libp2p/core/network/mocks"
@@ -55,7 +55,7 @@ func TestResourceManagerIsUsed(t *testing.T) {
 					}
 
 					expectFd := true
-					if strings.Contains(tc.Name, "QUIC") || strings.Contains(tc.Name, "WebTransport") {
+					if strings.Contains(tc.Name, "QUIC") || strings.Contains(tc.Name, "WebTransport") || strings.Contains(tc.Name, "WebRTC") {
 						expectFd = false
 					}
 
@@ -86,7 +86,7 @@ func TestResourceManagerIsUsed(t *testing.T) {
 						}
 						return nil
 					})
-					connScope.EXPECT().Done()
+					connScope.EXPECT().Done().MinTimes(1)
 
 					var allStreamsDone sync.WaitGroup
 

diff --git a/p2p/transport/webrtc/transport.go b/p2p/transport/webrtc/transport.go
@@ -214,12 +214,11 @@ func (t *WebRTCTransport) listenSocket(socket *net.UDPConn) (tpt.Listener, error
 }
 
 func (t *WebRTCTransport) Dial(ctx context.Context, remoteMultiaddr ma.Multiaddr, p peer.ID) (tpt.CapableConn, error) {
-	scope, err := t.rcmgr.OpenConnection(network.DirOutbound, true, remoteMultiaddr)
+	scope, err := t.rcmgr.OpenConnection(network.DirOutbound, false, remoteMultiaddr)
 	if err != nil {
 		return nil, err
 	}
-	err = scope.SetPeer(p)
-	if err != nil {
+	if err := scope.SetPeer(p); err != nil {
 		scope.Done()
 		return nil, err
 	}