|
1 | 1 | package org.tron.core.net; |
2 | 2 |
|
| 3 | +import io.netty.util.internal.StringUtil; |
3 | 4 | import java.net.InetSocketAddress; |
4 | 5 | import java.util.ArrayList; |
5 | 6 | import java.util.List; |
@@ -138,14 +139,25 @@ private P2pConfig getConfig() { |
138 | 139 | config.setActiveNodes(parameter.getActiveNodes()); |
139 | 140 | config.setTrustNodes(parameter.getPassiveNodes()); |
140 | 141 | 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 | + |
143 | 155 | config.setMaxConnectionsWithSameIp(parameter.getMaxConnectionsWithSameIp()); |
144 | 156 | config.setPort(parameter.getNodeListenPort()); |
145 | 157 | config.setVersion(parameter.getNodeP2pVersion()); |
146 | 158 | config.setDisconnectionPolicyEnable(parameter.isOpenFullTcpDisconnect()); |
147 | 159 | config.setDiscoverEnable(parameter.isNodeDiscoveryEnable()); |
148 | | - if (config.getIp() == null) { |
| 160 | + if (StringUtil.isNullOrEmpty(config.getIp())) { |
149 | 161 | config.setIp(parameter.getNodeExternalIp()); |
150 | 162 | } |
151 | 163 | return config; |
|
0 commit comments