From adef95b823a700438a36a5aa5879147c4c2279d7 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Sun, 25 Sep 2016 04:51:27 -0700 Subject: [PATCH] split tcp transports out of the base package --- swarm.go | 6 +++--- swarm_listen.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/swarm.go b/swarm.go index e36f763..4eebf62 100644 --- a/swarm.go +++ b/swarm.go @@ -21,13 +21,14 @@ import ( ci "github.com/ipfs/go-libp2p-crypto" peer "github.com/ipfs/go-libp2p-peer" pstore "github.com/ipfs/go-libp2p-peerstore" - transport "github.com/ipfs/go-libp2p-transport" logging "github.com/ipfs/go-log" ma "github.com/jbenet/go-multiaddr" ps "github.com/jbenet/go-peerstream" pst "github.com/jbenet/go-stream-muxer" "github.com/jbenet/goprocess" goprocessctx "github.com/jbenet/goprocess/context" + transport "github.com/libp2p/go-libp2p-transport" + tcpt "github.com/libp2p/go-tcp-transport" psmss "github.com/whyrusleeping/go-smux-multistream" spdy "github.com/whyrusleeping/go-smux-spdystream" yamux "github.com/whyrusleeping/go-smux-yamux" @@ -124,8 +125,7 @@ func NewSwarm(ctx context.Context, listenAddrs []ma.Multiaddr, dialT: DialTimeout, notifs: make(map[inet.Notifiee]ps.Notifiee), transports: []transport.Transport{ - transport.NewTCPTransport(), - transport.NewUtpTransport(), + tcpt.NewTCPTransport(), new(ws.WebsocketTransport), }, bwc: bwc, diff --git a/swarm_listen.go b/swarm_listen.go index 4eb61d5..92ccd83 100644 --- a/swarm_listen.go +++ b/swarm_listen.go @@ -4,9 +4,9 @@ import ( "fmt" lgbl "github.com/ipfs/go-libp2p-loggables" - transport "github.com/ipfs/go-libp2p-transport" ma "github.com/jbenet/go-multiaddr" ps "github.com/jbenet/go-peerstream" + transport "github.com/libp2p/go-libp2p-transport" mconn "github.com/libp2p/go-libp2p/p2p/metrics/conn" inet "github.com/libp2p/go-libp2p/p2p/net" conn "github.com/libp2p/go-libp2p/p2p/net/conn" -- GitLab