Merge pull request #2328 from tronprotocol/p2p_adv_t

Filter local IP in IP configuration list

Author: xxo1shine

src/main/java/org/tron/common/overlay/server/SyncPool.java

@@ -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;

src/main/java/org/tron/core/config/args/Args.java

@@ -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;
@@ -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);
@@ -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;
   }
@@ -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());

src/main/java/org/tron/program/FullNode.java

@@ -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;

src/main/java/org/tron/program/Version.java

@@ -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";
 

src/main/resources/config.conf

@@ -149,7 +149,8 @@ node {
   ]
 
   fastForward = [
-    "47.90.208.194:18888"
+    "47.90.208.194:18888",
+    "47.75.212.39:18888"
   ]
 
   http {