From 12402c7970d91c8ec7e4901cabc8b7bde3eae862 Mon Sep 17 00:00:00 2001 From: vyzo Date: Tue, 18 Jan 2022 10:57:07 +0200 Subject: [PATCH 1/2] default connection manager --- defaults.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/defaults.go b/defaults.go index 21b7f0b000..efb65ebc37 100644 --- a/defaults.go +++ b/defaults.go @@ -13,6 +13,7 @@ import ( rcmgr "github.com/libp2p/go-libp2p-resource-manager" tls "github.com/libp2p/go-libp2p-tls" yamux "github.com/libp2p/go-libp2p-yamux" + "github.com/libp2p/go-libp2p/p2p/net/connmgr" "github.com/libp2p/go-tcp-transport" ws "github.com/libp2p/go-ws-transport" "github.com/multiformats/go-multiaddr" @@ -99,6 +100,16 @@ var DefaultResourceManager = func(cfg *Config) error { return cfg.Apply(ResourceManager(mgr)) } +// DefaultConnManager creates a default connection manager +var DefaultConnectionManager = func(cfg *Config) error { + mgr, err := connmgr.NewConnManager(192, 256) + if err != nil { + return err + } + + return cfg.Apply(ConnectionManager(mgr)) +} + // Complete list of default options and when to fallback on them. // // Please *DON'T* specify default options any other way. Putting this all here @@ -139,6 +150,10 @@ var defaults = []struct { fallback: func(cfg *Config) bool { return cfg.ResourceManager == nil }, opt: DefaultResourceManager, }, + { + fallback: func(cfg *Config) bool { return cfg.ConnManager == nil }, + opt: DefaultConnectionManager, + }, } // Defaults configures libp2p to use the default options. Can be combined with From f9e4c5c8f5efc869a647c24471ef6938541d1a0f Mon Sep 17 00:00:00 2001 From: vyzo Date: Tue, 18 Jan 2022 11:37:47 +0200 Subject: [PATCH 2/2] slightly lower default connmgr limits --- defaults.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults.go b/defaults.go index efb65ebc37..f3e8aeba43 100644 --- a/defaults.go +++ b/defaults.go @@ -102,7 +102,7 @@ var DefaultResourceManager = func(cfg *Config) error { // DefaultConnManager creates a default connection manager var DefaultConnectionManager = func(cfg *Config) error { - mgr, err := connmgr.NewConnManager(192, 256) + mgr, err := connmgr.NewConnManager(160, 192) if err != nil { return err }