Skip to content

Filter local IP in IP configuration list #2328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 24, 2019
Merged

Filter local IP in IP configuration list #2328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
138c884
modify nodes cfg
xxo1shine Jun 24, 2019
78059cd
modify version to 3.6.1
xxo1shine Jun 24, 2019
630fcdf
modify syncpool test
xxo1shine Jun 24, 2019
5294a72
Merge branch 'release_3.6.1' of https://github.com/tronprotocol/java-…
xxo1shine Jun 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/main/java/org/tron/common/overlay/server/SyncPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,6 @@ public boolean test(NodeHandler handler) {
return false;
}

if (handler.getNodeStatistics().getReputation() >= NodeStatistics.REPUTATION_PREDEFINED) {
return true;
}

InetAddress inetAddress = handler.getInetSocketAddress().getAddress();
if (channelManager.getRecentlyDisconnected().getIfPresent(inetAddress) != null) {
return false;
Expand Down
20 changes: 13 additions & 7 deletions src/main/java/org/tron/core/config/args/Args.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,12 +741,6 @@ public static void setParam(final String[] args, final String confFileName) {
config.hasPath("node.connection.timeout") ? config.getInt("node.connection.timeout") * 1000
: 0;

INSTANCE.activeNodes = getNodes(config, "node.active");

INSTANCE.passiveNodes = getNodes(config, "node.passive");

INSTANCE.fastForwardNodes = getNodes(config, "node.fastForward");

INSTANCE.nodeChannelReadTimeout =
config.hasPath("node.channel.read.timeout") ? config.getInt("node.channel.read.timeout")
: 0;
Expand Down Expand Up @@ -951,6 +945,12 @@ public static void setParam(final String[] args, final String confFileName) {
.getInt("node.validContractProto.threads")
: Runtime.getRuntime().availableProcessors();

INSTANCE.activeNodes = getNodes(config, "node.active");

INSTANCE.passiveNodes = getNodes(config, "node.passive");

INSTANCE.fastForwardNodes = getNodes(config, "node.fastForward");

initBackupProperty(config);
if ("ROCKSDB".equals(Args.getInstance().getStorage().getDbEngine().toUpperCase())) {
initRocksDbBackupProperty(config);
Expand Down Expand Up @@ -1026,7 +1026,12 @@ private static List<Node> getNodes(final com.typesafe.config.Config config, Stri
List<String> list = config.getStringList(path);
for (String configString : list) {
Node n = Node.instanceOf(configString);
ret.add(n);
if (!(INSTANCE.nodeDiscoveryBindIp.equals(n.getHost()) ||
INSTANCE.nodeExternalIp.equals(n.getHost()) ||
"127.0.0.1".equals(n.getHost())) ||
INSTANCE.nodeListenPort != n.getPort()) {
ret.add(n);
}
}
return ret;
}
Expand Down Expand Up @@ -1321,6 +1326,7 @@ private static void logConfig() {
logger.info("Discover enable: {}", args.isNodeDiscoveryEnable());
logger.info("Active node size: {}", args.getActiveNodes().size());
logger.info("Passive node size: {}", args.getPassiveNodes().size());
logger.info("FastForward node size: {}", args.getFastForwardNodes().size());
logger.info("Seed node size: {}", args.getSeedNode().getIpList().size());
logger.info("Max connection: {}", args.getNodeMaxActiveNodes());
logger.info("Max connection with same IP: {}", args.getNodeMaxActiveNodesWithSameIp());
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/org/tron/program/FullNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package org.tron.program;

import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.joran.JoranConfigurator;
import java.io.File;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.tron.common.application.Application;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/tron/program/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.tron.program;

public class Version {
private static final String version = "3.6.0";
private static final String version = "3.6.1";
public static final String versionName = "Odyssey-v3.5.1-890-gd39973cbb";
public static final String versionCode = "10803";

Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/config.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ node {
]

fastForward = [
"47.90.208.194:18888"
"47.90.208.194:18888",
"47.75.212.39:18888"
]

http {
Expand Down