Skip to content

Commit 0cc1731

Browse files
committed
feat(net): optimize network connection parameters
1 parent 56f042e commit 0cc1731

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

framework/src/main/java/org/tron/core/net/TronNetService.java

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.tron.core.net;
22

3+
import io.netty.util.internal.StringUtil;
34
import java.net.InetSocketAddress;
45
import java.util.ArrayList;
56
import java.util.List;
@@ -138,14 +139,25 @@ private P2pConfig getConfig() {
138139
config.setActiveNodes(parameter.getActiveNodes());
139140
config.setTrustNodes(parameter.getPassiveNodes());
140141
config.getActiveNodes().forEach(n -> config.getTrustNodes().add(n.getAddress()));
141-
config.setMaxConnections(parameter.getMaxConnections());
142-
config.setMinConnections(parameter.getMinConnections());
142+
int maxConnections = parameter.getMaxConnections();
143+
int minConnections = parameter.getMinConnections();
144+
int minActiveConnections = parameter.getMinActiveConnections();
145+
if (minConnections > maxConnections) {
146+
minConnections = maxConnections;
147+
}
148+
if (minActiveConnections > minConnections) {
149+
minActiveConnections = minConnections;
150+
}
151+
config.setMaxConnections(maxConnections);
152+
config.setMinConnections(minConnections);
153+
config.setMinActiveConnections(minActiveConnections);
154+
143155
config.setMaxConnectionsWithSameIp(parameter.getMaxConnectionsWithSameIp());
144156
config.setPort(parameter.getNodeListenPort());
145157
config.setVersion(parameter.getNodeP2pVersion());
146158
config.setDisconnectionPolicyEnable(parameter.isOpenFullTcpDisconnect());
147159
config.setDiscoverEnable(parameter.isNodeDiscoveryEnable());
148-
if (config.getIp() == null) {
160+
if (StringUtil.isNullOrEmpty(config.getIp())) {
149161
config.setIp(parameter.getNodeExternalIp());
150162
}
151163
return config;

0 commit comments

Comments
 (0)