feat: remove broken spdy multiplexer and enable mplex by default
License: MIT Signed-off-by: Friedel <dignifiedquire@gmail.com>
Friedel Ziegelmayer committed
Feb 24, 2017 at 21:02 UTC
8b2aa5617dff31dbaacc5d1c3fc06cc4bec15da3
3 files changed
+2
-6
cmd/ipfs/daemon.go
+1
-2
@@ -161,8 +161,7 @@ Headers.
161
cmds.BoolOption(offlineKwd, "Run offline. Do not connect to the rest of the network but provide local API.").Default(false),
162
cmds.BoolOption(migrateKwd, "If true, assume yes at the migrate prompt. If false, assume no."),
163
cmds.BoolOption(enableFloodSubKwd, "Instantiate the ipfs daemon with the experimental pubsub feature enabled."),
164
- cmds.BoolOption(enableMultiplexKwd, "Add the experimental 'go-multiplex' stream muxer to libp2p on construction."),
165
-
164
+ cmds.BoolOption(enableMultiplexKwd, "Add the experimental 'go-multiplex' stream muxer to libp2p on construction.").Default(true),
165
// TODO: add way to override addresses. tricky part: updating the config if also --init.
166
// cmds.StringOption(apiAddrKwd, "Address for the daemon rpc API (overrides config)"),
167
// cmds.StringOption(swarmAddrKwd, "Address for the swarm socket (overrides config)"),
core/core.go
-3
@@ -63,7 +63,6 @@ import (
63
ping "gx/ipfs/QmU3g3psEDiC4tQh1Qu2NYg5aYVQqxC3m74ZavLwPfJEtu/go-libp2p/p2p/protocol/ping"
64
dht "gx/ipfs/QmUpZqxzrUoyDsgWXDri9yYgi5r5EK7J5Tan1MbgnawYLx/go-libp2p-kad-dht"
65
cid "gx/ipfs/QmV5gPoRsjN1Gid3LMdNZTyfCtP2DsvqEbMAmz82RmmiGk/go-cid"
66
- spdy "gx/ipfs/QmWUNsat6Jb19nC5CiJCDXepTkxjdxi3eZqeoB6mrmmaGu/go-smux-spdystream"
66
peer "gx/ipfs/QmZcUPvPhD1Xvk6mwijYF8AfR3mG31S1YsEfHG4khrFPRr/go-libp2p-peer"
67
routing "gx/ipfs/QmZghcVHwXQC3Zvnvn24LgTmSPkEn2o3PDyKb6nrtPRzRh/go-libp2p-routing"
68
u "gx/ipfs/QmZuY8aV7zbNXVy6DyN9SmnuH3o9nG852F4aTiSBpts8d1/go-ipfs-util"
@@ -277,8 +276,6 @@ func makeSmuxTransport(mplexExp bool) smux.Transport {
276
277
mstpt.AddTransport("/yamux/1.0.0", ymxtpt)
278
280
- mstpt.AddTransport("/spdy/3.1.0", spdy.Transport)
281
-
279
if mplexExp {
280
mstpt.AddTransport("/mplex/6.7.0", mplex.DefaultTransport)
281
}
test/sharness/t0130-multinode.sh
+1
-1
@@ -90,7 +90,7 @@ test_expect_success "set up tcp testbed" '
90
91
# test multiplex muxer
92
export LIBP2P_MUX_PREFS="/mplex/6.7.0"
93
-run_advanced_test "--enable-mplex-experiment"
93
+run_advanced_test
94
unset LIBP2P_MUX_PREFS
95
96
# test default configuration