cascade/ipfs-cluster
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cluster: re-add quic to defaults, but keep transport disabled

Browse Source 
This still works.
This commit is contained in:
Hector Sanjuan 2020-04-02 16:12:45 +02:00
parent ab74987bc8
commit bebd1e168c
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster_config.go
View File

@ -26,8 +26,7 @@ const configKey = "cluster"
// DefaultListenAddrs contains TCP and QUIC listen addresses. // DefaultListenAddrs contains TCP and QUIC listen addresses.
var DefaultListenAddrs = []string{ var DefaultListenAddrs = []string{
"/ip4/0.0.0.0/tcp/9096", "/ip4/0.0.0.0/tcp/9096",
// TODO: QUIC does not support private networks "/ip4/0.0.0.0/udp/9096/quic",
// "/ip4/0.0.0.0/udp/9096/quic",
} }
// Configuration defaults // Configuration defaults

5
clusterhost.go
View File

@ -17,6 +17,7 @@ import (
dht "github.com/libp2p/go-libp2p-kad-dht" dht "github.com/libp2p/go-libp2p-kad-dht"
dhtopts "github.com/libp2p/go-libp2p-kad-dht/opts" dhtopts "github.com/libp2p/go-libp2p-kad-dht/opts"
pubsub "github.com/libp2p/go-libp2p-pubsub" pubsub "github.com/libp2p/go-libp2p-pubsub"
libp2pquic "github.com/libp2p/go-libp2p-quic-transport"
secio "github.com/libp2p/go-libp2p-secio" secio "github.com/libp2p/go-libp2p-secio"
libp2ptls "github.com/libp2p/go-libp2p-tls" libp2ptls "github.com/libp2p/go-libp2p-tls"
routedhost "github.com/libp2p/go-libp2p/p2p/host/routed" routedhost "github.com/libp2p/go-libp2p/p2p/host/routed"
@ -25,6 +26,8 @@ import (
const dhtNamespace = "dht" const dhtNamespace = "dht"
var _ = libp2pquic.NewTransport
func init() { func init() {
// Cluster peers should advertise their public IPs as soon as they // Cluster peers should advertise their public IPs as soon as they
// learn about them. Default for this is 4, which prevents clusters // learn about them. Default for this is 4, which prevents clusters
@ -115,7 +118,7 @@ func baseOpts(psk corepnet.PSK) []libp2p.Option {
libp2p.Security(libp2ptls.ID, libp2ptls.New), libp2p.Security(libp2ptls.ID, libp2ptls.New),
libp2p.Security(secio.ID, secio.New), libp2p.Security(secio.ID, secio.New),
// TODO: quic does not support private networks // TODO: quic does not support private networks
//libp2p.Transport(libp2pquic.NewTransport), // libp2p.Transport(libp2pquic.NewTransport),
libp2p.DefaultTransports, libp2p.DefaultTransports,
} }
} }

5
ipfscluster_test.go
View File

@ -289,15 +289,14 @@ func createHosts(t *testing.T, clusterSecret []byte, nClusters int) ([]host.Host
dhts := make([]*dht.IpfsDHT, nClusters, nClusters) dhts := make([]*dht.IpfsDHT, nClusters, nClusters)
tcpaddr, _ := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/0") tcpaddr, _ := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/0")
//quicAddr, _ := ma.NewMultiaddr("/ip4/127.0.0.1/udp/0/quic") quicAddr, _ := ma.NewMultiaddr("/ip4/127.0.0.1/udp/0/quic")
for i := range hosts { for i := range hosts {
priv, _, err := crypto.GenerateKeyPair(crypto.RSA, 2048) priv, _, err := crypto.GenerateKeyPair(crypto.RSA, 2048)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
//h, p, d := createHost(t, priv, clusterSecret, []ma.Multiaddr{quicAddr, tcpaddr}) h, p, d := createHost(t, priv, clusterSecret, []ma.Multiaddr{quicAddr, tcpaddr})
h, p, d := createHost(t, priv, clusterSecret, []ma.Multiaddr{tcpaddr})
hosts[i] = h hosts[i] = h
dhts[i] = d dhts[i] = d
pubsubs[i] = p pubsubs[i] = p