From 1fc2a917d4aeae32b945cf6c8573a71b80dd62c5 Mon Sep 17 00:00:00 2001
From: grez911 <grez911@gmail.com>
Date: Fri, 18 Aug 2017 11:29:41 +0300
Subject: [PATCH] Fix P2P port check

---
 src/File/FileRequest.py |  4 ++--
 src/File/FileServer.py  | 38 +++++++++++++++-----------------------
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/src/File/FileRequest.py b/src/File/FileRequest.py
index 12f8ee4d..b458c6a2 100644
--- a/src/File/FileRequest.py
+++ b/src/File/FileRequest.py
@@ -463,9 +463,9 @@ class FileRequest(object):
         with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as sock:
             sock.settimeout(5)
             if sock.connect_ex((self.connection.ip, params["port"])) == 0:
-                self.response("open %s" % self.connection.ip)
+                self.response({"status": "open", "ip_external": self.connection.ip})
             else:
-                self.response("closed %s" % self.connection.ip)
+                self.response({"status": "closed", "ip_external": self.connection.ip})
 
     # Unknown command
     def actionUnknown(self, cmd, params):
diff --git a/src/File/FileServer.py b/src/File/FileServer.py
index f0212606..80cdbd36 100644
--- a/src/File/FileServer.py
+++ b/src/File/FileServer.py
@@ -97,48 +97,40 @@ class FileServer(ConnectionServer):
 
     def testOpenportP2P(self, port=None):
         self.log.info("Checking port %s using P2P..." % port)
-        site = SiteManager.site_manager.get("1HeLLo4uzjaLetFx6NH3PMwFP3qbRbTf3D")
+        site = SiteManager.site_manager.get(config.homepage)
         peers = []
         res = None
         if not site:    # First run, has no any peers
             return self.testOpenportPortchecker(port)  # Fallback to centralized service
-        for peer in site.peers.values():   # Get all non-onion peers
-            if peer.ip.endswith(".onion"):
+        for peer in site.peers.values():
+            if not peer.ip.endswith(".onion"):  # Get all non-onion peers
                 peers.append(peer)
         if len(peers) < 3:   # Not enough peers
             return self.testOpenportPortchecker(port)  # Fallback to centralized service
-        for retry in range(1, 3): # Try 3 peers
+        for retry in range(0, 3): # Try 3 peers
             random_peer = random.choice(peers)
             with gevent.Timeout(10.0, False):  # 10 sec timeout, don't raise exception
                 random_peer.connect()
                 res = random_peer.request("checkport", {"port": port})
-                break  # All fine, exit from for loop
+                if res is not None:
+                    break  # All fine, exit from for loop
         if res is None:  # Nobody answered
             return self.testOpenportPortchecker(port)  # Fallback to centralized service
-        message = res["body"]
-        if "open" not in message:
+        if res["status"] == "closed":
             if config.tor != "always":
-                self.log.info("[BAD :(] Port closed %s" % message)
+                self.log.info("[BAD :(] %s says that your port %s is closed" % (random_peer.ip, port))
             if port == self.port:
                 self.port_opened = False  # Self port, update port_opened status
-                match = message.split(" ", 1)[1]  # Try find my external ip in message
-                if match:  # Found my ip in message
-                    config.ip_external = match
-                    SiteManager.peer_blacklist.append((config.ip_external, self.port))  # Add myself to peer blacklist
-                else:
-                    config.ip_external = False
-            return {"result": False, "message": message}
+                config.ip_external = res["ip_external"]
+                SiteManager.peer_blacklist.append((config.ip_external, self.port))  # Add myself to peer blacklist
+            return {"result": False}
         else:
-            self.log.info("[OK :)] Port open: %s" % message)
+            self.log.info("[OK :)] %s says that your port %s is open" % (random_peer.ip, port))
             if port == self.port:  # Self port, update port_opened status
                 self.port_opened = True
-                match = message.split(" ", 1)[1]  # Try find my external ip in message
-                if match:  # Found my ip in message
-                    config.ip_external = match
-                    SiteManager.peer_blacklist.append((config.ip_external, self.port))  # Add myself to peer blacklist
-                else:
-                    config.ip_external = False
-            return {"result": True, "message": message}
+                config.ip_external = res["ip_external"]
+                SiteManager.peer_blacklist.append((config.ip_external, self.port))  # Add myself to peer blacklist
+            return {"result": True}
 
     def testOpenportPortchecker(self, port=None):
         self.log.info("Checking port %s using portchecker.co..." % port)