From 87c3da6c668b00aa9137e29befa07def682d91b5 Mon Sep 17 00:00:00 2001 From: Robert Zajac Date: Sun, 11 Nov 2018 20:41:06 -0500 Subject: [PATCH] swarm listen done --- network/swarm.py | 3 +-- transport/upgrader.py | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/network/swarm.py b/network/swarm.py index cb20f99c..39fe2611 100644 --- a/network/swarm.py +++ b/network/swarm.py @@ -76,7 +76,6 @@ class Swarm(INetwork): # Have conn handler delegate to stream handler # Call listener listen with the multiaddr # Map multiaddr to listener - for multiaddr_str in args: if multiaddr_str in self.listeners: return True @@ -87,7 +86,7 @@ class Swarm(INetwork): def conn_handler(reader, writer): # Upgrade reader/write to a net_stream and pass to appropriate stream handler (using multiaddr) raw_conn = RawConnection(multiaddr_dict.host, multiaddr_dict.port, reader, writer) - muxed_conn = self.upgrader.upgrade_connection(raw_conn) + muxed_conn = self.upgrader.upgrade_connection(raw_conn, False) # TODO: make generic protocols work muxed_stream, stream_id, protocol_id = muxed_conn.accept_stream() diff --git a/transport/upgrader.py b/transport/upgrader.py index 05e22187..6cd5b2ec 100644 --- a/transport/upgrader.py +++ b/transport/upgrader.py @@ -24,5 +24,4 @@ class TransportUpgrader(object): # Default to mplex # TODO do exchange to determine multiplexer - return MuxedConn(conn, initiator)