fix: disable reuseport and quic

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
berty · Jan 26, 2022 · 36348ca · 36348ca
1 parent dddfce7
commit 36348ca
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 15 deletions.
diff --git a/config/config.yml b/config/config.yml
@@ -49,15 +49,15 @@ p2p:
   rdvp:
     # svc fr
     - maddr: '/ip4/51.159.21.214/tcp/4040/p2p/QmdT7AmhhnbuwvCpa5PH1ySK9HJVB82jr3fo1bxMxBPW6p'
-    - maddr: '/ip4/51.159.21.214/udp/4040/quic/p2p/QmdT7AmhhnbuwvCpa5PH1ySK9HJVB82jr3fo1bxMxBPW6p'
+    # - maddr: '/ip4/51.159.21.214/udp/4040/quic/p2p/QmdT7AmhhnbuwvCpa5PH1ySK9HJVB82jr3fo1bxMxBPW6p'
     # svc ams
     - maddr: '/ip4/51.15.25.224/tcp/4040/p2p/12D3KooWHhDBv6DJJ4XDWjzEXq6sVNEs6VuxsV1WyBBEhPENHzcZ'
-    - maddr: '/ip4/51.15.25.224/udp/4040/quic/p2p/12D3KooWHhDBv6DJJ4XDWjzEXq6sVNEs6VuxsV1WyBBEhPENHzcZ'
+    # - maddr: '/ip4/51.15.25.224/udp/quic/4040/p2p/12D3KooWHhDBv6DJJ4XDWjzEXq6sVNEs6VuxsV1WyBBEhPENHzcZ'
   static-relays:
     # berty relays
-    - '/ip4/51.159.21.214/udp/4040/quic/p2p/QmdT7AmhhnbuwvCpa5PH1ySK9HJVB82jr3fo1bxMxBPW6p'
-    - '/ip4/51.15.25.224/udp/4040/quic/p2p/12D3KooWHhDBv6DJJ4XDWjzEXq6sVNEs6VuxsV1WyBBEhPENHzcZ'
+    - '/ip4/51.159.21.214/tcp/4040/p2p/QmdT7AmhhnbuwvCpa5PH1ySK9HJVB82jr3fo1bxMxBPW6p'
+    - '/ip4/51.15.25.224/tcp/4040/p2p/12D3KooWHhDBv6DJJ4XDWjzEXq6sVNEs6VuxsV1WyBBEhPENHzcZ'
     # ipfs relays
-    - '/ip4/147.75.80.110/udp/4001/quic/p2p/QmbFgm5zan8P6eWWmeyfncR5feYEMPbht5b1FW1C37aQ7y'
-    - '/ip4/147.75.195.153/udp/4001/quic/p2p/QmW9m57aiBDHAkKj9nmFSEn7ZqrcF1fZS4bipsTCHburei'
-    - '/ip4/147.75.70.221/udp/4001/quic/p2p/Qme8g49gm3q4Acp7xWBKg3nAa9fxZ1YmyDJdyGgoG6LsXh'
+    - '/ip4/147.75.80.110/tcp/4001/p2p/QmbFgm5zan8P6eWWmeyfncR5feYEMPbht5b1FW1C37aQ7y'
+    - '/ip4/147.75.195.153/tcp/4001/p2p/QmW9m57aiBDHAkKj9nmFSEn7ZqrcF1fZS4bipsTCHburei'
+    - '/ip4/147.75.70.221/tcp/4001/p2p/Qme8g49gm3q4Acp7xWBKg3nAa9fxZ1YmyDJdyGgoG6LsXh'
diff --git a/go/internal/initutil/ipfs.go b/go/internal/initutil/ipfs.go
@@ -26,6 +26,7 @@ import (
 	discovery "github.com/libp2p/go-libp2p-discovery"
 	p2p_dht "github.com/libp2p/go-libp2p-kad-dht"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
+	"github.com/libp2p/go-tcp-transport"
 	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr/net"
 	"go.uber.org/zap"
@@ -175,7 +176,8 @@ func (m *Manager) getLocalIPFS() (ipfsutil.ExtendedCoreAPI, *ipfs_core.IpfsNode,
 
 	var routing ipfs_p2p.RoutingOption
 	if dhtmode > 0 && !m.Node.Protocol.DisableIPFSNetwork {
-		dhtopts := []p2p_dht.Option{p2p_dht.Concurrency(2)}
+		dhtopts := []p2p_dht.Option{p2p_dht.Concurrency(5)}
+
 		if m.Node.Protocol.DHTRandomWalk {
 			dhtopts = append(dhtopts, p2p_dht.DisableAutoRefresh())
 		}
@@ -509,10 +511,19 @@ func (m *Manager) setupIPFSConfig(cfg *ipfs_cfg.Config) ([]libp2p.Option, error)
 	for _, p := range rdvpeers {
 		cfg.Peering.Peers = append(cfg.Peering.Peers, *p)
 	}
-
 	// disable main ipfs pubsub
 	cfg.Pubsub.Enabled = ipfs_cfg.False
 
+	// @NOTE(gfanton): disable quic transport until find a fix on lte
+	cfg.Swarm.Transports.Network.QUIC = ipfs_cfg.False
+
+	// @NOTE(gfanton): disable tcp transport so we can init a custom transport
+	// with reusport disable
+	cfg.Swarm.Transports.Network.TCP = ipfs_cfg.False
+	p2popts = append(p2popts, libp2p.Transport(tcp.NewTCPTransport,
+		tcp.DisableReuseport(),
+	))
+
 	return p2popts, nil
 }
 

diff --git a/go/internal/ipfsutil/repo.go b/go/internal/ipfsutil/repo.go
@@ -82,8 +82,6 @@ func LoadRepoFromPath(path string, key []byte) (ipfs_repo.Repo, error) {
 var DefaultSwarmListeners = []string{
 	"/ip4/0.0.0.0/tcp/0",
 	"/ip6/::/tcp/0",
-	"/ip4/0.0.0.0/udp/0/quic",
-	"/ip6/::/udp/0/quic",
 }
 
 func createBaseConfig() (*ipfs_cfg.Config, error) {

diff --git a/js/packages/go-bridge/defaults.ts b/js/packages/go-bridge/defaults.ts
@@ -3,8 +3,8 @@ import { GoBridgeOpts } from './types'
 export const GoBridgeDefaultOpts: GoBridgeOpts = {
 	cliArgs: [
 		'--node.display-name=',
-		'--node.listeners=/ip4/127.0.0.1/tcp/0/grpcws',
-		'--p2p.swarm-listeners=/ip4/0.0.0.0/tcp/0,/ip6/::/tcp/0,/ip4/0.0.0.0/udp/0/quic,/ip6/::/udp/0/quic',
+		// '--node.listeners=/ip4/127.0.0.1/tcp/0/grpcws',
+		'--p2p.swarm-listeners=/ip4/0.0.0.0/tcp/0',
 		'--p2p.high-water=60',
 		'--p2p.low-water=40',
 		'--p2p.webui-listener=:3000',

diff --git a/tool/deployments/testbot/docker-compose.yml b/tool/deployments/testbot/docker-compose.yml
@@ -17,12 +17,12 @@ services:
       rm -rf /store/run;
       cp -rf /store/clean /store/run;
       env;
-      berty daemon 
+      berty daemon
         -config=/app/config1.txt
         -store.dir=/store/run
         -node.no-notif
         -node.listeners=/ip4/0.0.0.0/tcp/9091/grpc
-        -p2p.swarm-listeners=/ip4/0.0.0.0/tcp/6002,/ip4/0.0.0.0/udp/6002/quic
+        -p2p.swarm-listeners=/ip4/0.0.0.0/tcp/6002
         -log.filters=*,-ipfs.*
         -log.format=json
         -node.disable-group-monitor