From 039040749790f5a565e737bff0c42d7242f526cf Mon Sep 17 00:00:00 2001 From: Jeromy Date: Fri, 26 Aug 2016 13:56:47 -0700 Subject: [PATCH] use correct protocol names for ipfs services License: MIT Signed-off-by: Jeromy --- diagnostics/diag.go | 6 ++++-- exchange/bitswap/network/interface.go | 3 ++- exchange/bitswap/network/ipfs_impl.go | 4 ++-- routing/dht/dht.go | 4 +++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/diagnostics/diag.go b/diagnostics/diag.go index c31cbab2ffc..23ca8d87c9d 100644 --- a/diagnostics/diag.go +++ b/diagnostics/diag.go @@ -26,7 +26,8 @@ import ( var log = logging.Logger("diagnostics") // ProtocolDiag is the diagnostics protocol.ID -var ProtocolDiag protocol.ID = "/ipfs/diagnostics" +var ProtocolDiag protocol.ID = "/ipfs/diag/net/1.0.0" +var ProtocolDiagOld protocol.ID = "/ipfs/diagnostics" var ErrAlreadyRunning = errors.New("diagnostic with that ID already running") @@ -54,6 +55,7 @@ func NewDiagnostics(self peer.ID, h host.Host) *Diagnostics { } h.SetStreamHandler(ProtocolDiag, d.handleNewStream) + h.SetStreamHandler(ProtocolDiagOld, d.handleNewStream) return d } @@ -203,7 +205,7 @@ func (d *Diagnostics) getDiagnosticFromPeers(ctx context.Context, peers map[peer } func (d *Diagnostics) getDiagnosticFromPeer(ctx context.Context, p peer.ID, pmes *pb.Message) (<-chan *DiagInfo, error) { - s, err := d.host.NewStream(ctx, p, ProtocolDiag) + s, err := d.host.NewStream(ctx, p, ProtocolDiag, ProtocolDiagOld) if err != nil { return nil, err } diff --git a/exchange/bitswap/network/interface.go b/exchange/bitswap/network/interface.go index 16f0dfed2e3..1c40f0a3ea4 100644 --- a/exchange/bitswap/network/interface.go +++ b/exchange/bitswap/network/interface.go @@ -8,7 +8,8 @@ import ( protocol "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/protocol" ) -var ProtocolBitswap protocol.ID = "/ipfs/bitswap" +var ProtocolBitswap protocol.ID = "/ipfs/bitswap/1.0.0" +var ProtocolBitswapOld protocol.ID = "/ipfs/bitswap" // BitSwapNetwork provides network connectivity for BitSwap sessions type BitSwapNetwork interface { diff --git a/exchange/bitswap/network/ipfs_impl.go b/exchange/bitswap/network/ipfs_impl.go index fe764641d9b..055d6e5491c 100644 --- a/exchange/bitswap/network/ipfs_impl.go +++ b/exchange/bitswap/network/ipfs_impl.go @@ -26,7 +26,7 @@ func NewFromIpfsHost(host host.Host, r routing.ContentRouting) BitSwapNetwork { routing: r, } host.SetStreamHandler(ProtocolBitswap, bitswapNetwork.handleNewStream) - host.SetStreamHandler("/bitswap/1.0.0", bitswapNetwork.handleNewStream) + host.SetStreamHandler(ProtocolBitswapOld, bitswapNetwork.handleNewStream) host.Network().Notify((*netNotifiee)(&bitswapNetwork)) // TODO: StopNotify. @@ -73,7 +73,7 @@ func (bsnet *impl) newStreamToPeer(ctx context.Context, p peer.ID) (inet.Stream, return nil, err } - return bsnet.host.NewStream(ctx, p, "/bitswap/1.0.0", ProtocolBitswap) + return bsnet.host.NewStream(ctx, p, ProtocolBitswap, ProtocolBitswapOld) } func (bsnet *impl) SendMessage( diff --git a/routing/dht/dht.go b/routing/dht/dht.go index 6de362e13cd..29660c6fce9 100644 --- a/routing/dht/dht.go +++ b/routing/dht/dht.go @@ -31,7 +31,8 @@ import ( var log = logging.Logger("dht") -var ProtocolDHT protocol.ID = "/ipfs/dht" +var ProtocolDHT protocol.ID = "/ipfs/kad/1.0.0" +var ProtocolDHTOld protocol.ID = "/ipfs/dht" // NumBootstrapQueries defines the number of random dht queries to do to // collect members of the routing table. @@ -85,6 +86,7 @@ func NewDHT(ctx context.Context, h host.Host, dstore ds.Batching) *IpfsDHT { dht.ctx = ctx h.SetStreamHandler(ProtocolDHT, dht.handleNewStream) + h.SetStreamHandler(ProtocolDHTOld, dht.handleNewStream) dht.providers = providers.NewProviderManager(dht.ctx, dht.self, dstore) dht.proc.AddChild(dht.providers.Process()) goprocessctx.CloseAfterContext(dht.proc, ctx)