From 4f472982da1af24da7c2ee8222097be291047106 Mon Sep 17 00:00:00 2001
From: shortcutme <tamas@zeronet.io>
Date: Wed, 14 Mar 2018 22:26:59 +0100
Subject: [PATCH] Use broken ssl ip list instead of peer_id

---
 src/Connection/Connection.py       | 5 +++--
 src/Connection/ConnectionServer.py | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Connection/Connection.py b/src/Connection/Connection.py
index 69ff1232..39da0f24 100644
--- a/src/Connection/Connection.py
+++ b/src/Connection/Connection.py
@@ -442,8 +442,9 @@ class Connection(object):
                 self.sock = CryptConnection.manager.wrapSocket(self.sock, self.crypt, server, cert_pin=self.cert_pin)
                 self.sock_wrapped = True
             except Exception, err:
-                self.log("Crypt connection error: %s, adding peerid %s as broken ssl." % (err, message["params"]["peer_id"]))
-                self.server.broken_ssl_peer_ids[message["params"]["peer_id"]] = True
+                if not config.force_encryption:
+                    self.log("Crypt connection error: %s, adding ip %s as broken ssl." % (err, self.ip))
+                    self.server.broken_ssl_ips[self.ip] = True
                 self.close("Broken ssl")
 
         if not self.sock_wrapped and self.cert_pin:
diff --git a/src/Connection/ConnectionServer.py b/src/Connection/ConnectionServer.py
index 2664ba6a..0ab2e154 100644
--- a/src/Connection/ConnectionServer.py
+++ b/src/Connection/ConnectionServer.py
@@ -35,7 +35,7 @@ class ConnectionServer(object):
         self.connections = []  # Connections
         self.whitelist = config.ip_local  # No flood protection on this ips
         self.ip_incoming = {}  # Incoming connections from ip in the last minute to avoid connection flood
-        self.broken_ssl_peer_ids = {}  # Peerids of broken ssl connections
+        self.broken_ssl_ips = {}  # Peerids of broken ssl connections
         self.ips = {}  # Connection by ip
         self.has_internet = True  # Internet outage detection
 
@@ -192,7 +192,7 @@ class ConnectionServer(object):
             run_i += 1
             time.sleep(15)  # Check every minute
             self.ip_incoming = {}  # Reset connected ips counter
-            self.broken_ssl_peer_ids = {}  # Reset broken ssl peerids count
+            self.broken_ssl_ips = {}  # Reset broken ssl peerids count
             last_message_time = 0
             s = time.time()
             for connection in self.connections[:]:  # Make a copy