From: ThomasV <thomasv@gitorious>
Date: Fri, 26 Apr 2013 10:00:14 +0000 (+0400)
Subject: do not do SSL handshake on connect
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=fc5bb4b747ed8b2b726fe2e41aa2435a2c8edb51

do not do SSL handshake on connect
---

diff --git a/transports/stratum_tcp.py b/transports/stratum_tcp.py
index 88ec0cf..6f29636 100644
--- a/transports/stratum_tcp.py
+++ b/transports/stratum_tcp.py
@@ -13,6 +13,7 @@ class TcpSession(Session):
 
     def __init__(self, connection, address, use_ssl, ssl_certfile, ssl_keyfile):
         Session.__init__(self)
+        self.use_ssl = use_ssl
         if use_ssl:
             import ssl
             self._connection = ssl.wrap_socket(
@@ -20,13 +21,18 @@ class TcpSession(Session):
                 server_side=True,
                 certfile=ssl_certfile,
                 keyfile=ssl_keyfile,
-                ssl_version=ssl.PROTOCOL_SSLv23)
+                ssl_version=ssl.PROTOCOL_SSLv23,
+                do_handshake_on_connect=False)
         else:
             self._connection = connection
 
         self.address = address[0]
         self.name = "TCP " if not use_ssl else "SSL "
 
+    def do_handshake(self):
+        if self.use_ssl:
+            self._connection.do_handshake()
+
     def connection(self):
         if self.stopped():
             raise Exception("Session was stopped")
@@ -72,6 +78,11 @@ class TcpClientRequestor(threading.Thread):
         threading.Thread.__init__(self)
 
     def run(self):
+        try:
+            self.session.do_handshake()
+        except:
+            return
+
         while not self.shared.stopped():
             if not self.update():
                 break
@@ -143,10 +154,7 @@ class TcpServer(threading.Thread):
         self.ssl_certfile = ssl_certfile
 
     def run(self):
-        if self.use_ssl:
-            print_log("TCP/SSL server started.")
-        else:
-            print_log("TCP server started.")
+        print_log( ("SSL" if self.use_ssl else "TCP") + " server started on port %d"%self.port)
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         sock.bind((self.host, self.port))