From c9d082d6b1074cdd84da30e43055926f5fbab780 Mon Sep 17 00:00:00 2001 From: sukun Date: Thu, 7 Sep 2023 12:55:29 +0530 Subject: [PATCH] add test --- p2p/net/swarm/swarm_dial_test.go | 8 ++++++++ x.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 x.patch diff --git a/p2p/net/swarm/swarm_dial_test.go b/p2p/net/swarm/swarm_dial_test.go index 47310978fe..13f56fb930 100644 --- a/p2p/net/swarm/swarm_dial_test.go +++ b/p2p/net/swarm/swarm_dial_test.go @@ -277,6 +277,9 @@ func TestAddrsForDialFiltering(t *testing.T) { t1 := ma.StringCast("/ip4/1.2.3.4/tcp/1") ws1 := ma.StringCast("/ip4/1.2.3.4/tcp/1/ws") + unSpecQ := ma.StringCast("/ip4/0.0.0.0/udp/2/quic-v1") + unSpecT := ma.StringCast("/ip6/::/tcp/2/") + resolver, err := madns.NewResolver(madns.WithDefaultResolver(&madns.MockResolver{})) require.NoError(t, err) s := newTestSwarmWithResolver(t, resolver) @@ -307,6 +310,11 @@ func TestAddrsForDialFiltering(t *testing.T) { input: append([]ma.Multiaddr{q1}, ourAddrs...), output: []ma.Multiaddr{q1}, }, + { + name: "unspecified-filtered", + input: []ma.Multiaddr{q1v1, t1, unSpecQ, unSpecT}, + output: []ma.Multiaddr{q1v1, t1}, + }, } ctx := context.Background() diff --git a/x.patch b/x.patch new file mode 100644 index 0000000000..e1cad70bf6 --- /dev/null +++ b/x.patch @@ -0,0 +1,28 @@ +diff --git a/p2p/transport/quicreuse/listener.go b/p2p/transport/quicreuse/listener.go +index 4ee20042..757cee13 100644 +--- a/p2p/transport/quicreuse/listener.go ++++ b/p2p/transport/quicreuse/listener.go +@@ -127,6 +127,7 @@ func (l *quicListener) Run() error { + defer l.transport.DecreaseCount() + for { + conn, err := l.l.Accept(context.Background()) ++ fmt.Println("received main conn") + if err != nil { + if errors.Is(err, quic.ErrServerClosed) || strings.Contains(err.Error(), "use of closed network connection") { + return transport.ErrListenerClosed +@@ -191,6 +192,7 @@ func (l *listener) Accept(ctx context.Context) (quic.Connection, error) { + case <-l.acceptLoopRunning: + return nil, transport.ErrListenerClosed + case c, ok := <-l.queue: ++ fmt.Println("received conn from queue") + if !ok { + return nil, transport.ErrListenerClosed + } +@@ -214,6 +216,7 @@ func (l *listener) Close() error { + for conn := range l.queue { + conn.CloseWithError(1, "closing") + } ++ fmt.Println("drained the queue") + }) + return nil + }