use correct protocol names for ipfs services
License: MIT Signed-off-by: Jeromy <why@ipfs.io>
Jeromy committed
Aug 26, 2016 at 13:56 UTC
039040749790f5a565e737bff0c42d7242f526cf
4 files changed
+11
-6
diagnostics/diag.go
+4
-2
@@ -26,7 +26,8 @@ import (
26
var log = logging.Logger("diagnostics")
27
28
// ProtocolDiag is the diagnostics protocol.ID
29
-var ProtocolDiag protocol.ID = "/ipfs/diagnostics"
29
+var ProtocolDiag protocol.ID = "/ipfs/diag/net/1.0.0"
30
+var ProtocolDiagOld protocol.ID = "/ipfs/diagnostics"
31
32
var ErrAlreadyRunning = errors.New("diagnostic with that ID already running")
33
@@ -54,6 +55,7 @@ func NewDiagnostics(self peer.ID, h host.Host) *Diagnostics {
55
}
56
57
h.SetStreamHandler(ProtocolDiag, d.handleNewStream)
58
+ h.SetStreamHandler(ProtocolDiagOld, d.handleNewStream)
59
return d
60
}
61
@@ -203,7 +205,7 @@ func (d *Diagnostics) getDiagnosticFromPeers(ctx context.Context, peers map[peer
205
}
206
207
func (d *Diagnostics) getDiagnosticFromPeer(ctx context.Context, p peer.ID, pmes *pb.Message) (<-chan *DiagInfo, error) {
206
- s, err := d.host.NewStream(ctx, p, ProtocolDiag)
208
+ s, err := d.host.NewStream(ctx, p, ProtocolDiag, ProtocolDiagOld)
209
if err != nil {
210
return nil, err
211
}
exchange/bitswap/network/interface.go
+2
-1
@@ -8,7 +8,8 @@ import (
8
protocol "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/protocol"
9
)
10
11
-var ProtocolBitswap protocol.ID = "/ipfs/bitswap"
11
+var ProtocolBitswap protocol.ID = "/ipfs/bitswap/1.0.0"
12
+var ProtocolBitswapOld protocol.ID = "/ipfs/bitswap"
13
14
// BitSwapNetwork provides network connectivity for BitSwap sessions
15
type BitSwapNetwork interface {
exchange/bitswap/network/ipfs_impl.go
+2
-2
@@ -26,7 +26,7 @@ func NewFromIpfsHost(host host.Host, r routing.ContentRouting) BitSwapNetwork {
26
routing: r,
27
}
28
host.SetStreamHandler(ProtocolBitswap, bitswapNetwork.handleNewStream)
29
- host.SetStreamHandler("/bitswap/1.0.0", bitswapNetwork.handleNewStream)
29
+ host.SetStreamHandler(ProtocolBitswapOld, bitswapNetwork.handleNewStream)
30
host.Network().Notify((*netNotifiee)(&bitswapNetwork))
31
// TODO: StopNotify.
32
@@ -73,7 +73,7 @@ func (bsnet *impl) newStreamToPeer(ctx context.Context, p peer.ID) (inet.Stream,
73
return nil, err
74
}
75
76
- return bsnet.host.NewStream(ctx, p, "/bitswap/1.0.0", ProtocolBitswap)
76
+ return bsnet.host.NewStream(ctx, p, ProtocolBitswap, ProtocolBitswapOld)
77
}
78
79
func (bsnet *impl) SendMessage(
routing/dht/dht.go
+3
-1
@@ -31,7 +31,8 @@ import (
31
32
var log = logging.Logger("dht")
33
34
-var ProtocolDHT protocol.ID = "/ipfs/dht"
34
+var ProtocolDHT protocol.ID = "/ipfs/kad/1.0.0"
35
+var ProtocolDHTOld protocol.ID = "/ipfs/dht"
36
37
// NumBootstrapQueries defines the number of random dht queries to do to
38
// collect members of the routing table.
@@ -85,6 +86,7 @@ func NewDHT(ctx context.Context, h host.Host, dstore ds.Batching) *IpfsDHT {
86
dht.ctx = ctx
87
88
h.SetStreamHandler(ProtocolDHT, dht.handleNewStream)
89
+ h.SetStreamHandler(ProtocolDHTOld, dht.handleNewStream)
90
dht.providers = providers.NewProviderManager(dht.ctx, dht.self, dstore)
91
dht.proc.AddChild(dht.providers.Process())
92
goprocessctx.CloseAfterContext(dht.proc, ctx)