X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=transports%2Fstratum_tcp.py;h=b21ca96503aab68a06d6e10c5c1d4772ae053ea8;hb=39b39855ff131a79eb769fe5dcc7bd2ee6b820a9;hp=ab6c5c3bf948f8ee7d3af7fbd47d0b3480ae0c69;hpb=5ee042c213baa4ae8a0f538de64644ae9abe7b36;p=electrum-server.git

diff --git a/transports/stratum_tcp.py b/transports/stratum_tcp.py
index ab6c5c3..b21ca96 100644
--- a/transports/stratum_tcp.py
+++ b/transports/stratum_tcp.py
@@ -1,18 +1,30 @@
 import json
+import Queue as queue
 import socket
 import threading
 import time
-import Queue as queue
 
 from processor import Session, Dispatcher
+from utils import print_log
+
 
 class TcpSession(Session):
 
-    def __init__(self, connection, address):
-        self._connection = connection
-        self.address = address
+    def __init__(self, connection, address, use_ssl, ssl_certfile, ssl_keyfile):
         Session.__init__(self)
-        print "New session", address
+        if use_ssl:
+            import ssl
+            self._connection = ssl.wrap_socket(
+                connection,
+                server_side=True,
+                certfile=ssl_certfile,
+                keyfile=ssl_keyfile,
+                ssl_version=ssl.PROTOCOL_SSLv23)
+        else:
+            self._connection = connection
+
+        self.address = address[0]
+        self.name = "TCP " if not use_ssl else "SSL "
 
     def connection(self):
         if self.stopped():
@@ -22,23 +34,24 @@ class TcpSession(Session):
 
     def stop(self):
         self._connection.close()
-        print "Terminating connection:", self.address[0]
+        #print "Terminating connection:", self.address
         with self.lock:
             self._stopped = True
 
     def send_response(self, response):
-        raw_response = json.dumps(response)
+        data = json.dumps(response) + "\n"
         # Possible race condition here by having session
         # close connection?
         # I assume Python connections are thread safe interfaces
         try:
             connection = self.connection()
-            connection.send(raw_response + "\n")
+            while data:
+                l = connection.send(data)
+                data = data[l:]
         except:
             self.stop()
 
 
-
 class TcpClientRequestor(threading.Thread):
 
     def __init__(self, dispatcher, session):
@@ -53,6 +66,8 @@ class TcpClientRequestor(threading.Thread):
             if not self.update():
                 break
 
+            self.session.time = time.time()
+
             while self.parse():
                 pass
 
@@ -68,7 +83,7 @@ class TcpClientRequestor(threading.Thread):
 
     def receive(self):
         try:
-            return self.session.connection().recv(1024)
+            return self.session.connection().recv(2048)
         except:
             return ''
 
@@ -79,7 +94,7 @@ class TcpClientRequestor(threading.Thread):
 
         raw_command = self.message[0:raw_buffer].strip()
         self.message = self.message[raw_buffer + 1:]
-        if raw_command == 'quit': 
+        if raw_command == 'quit':
             self.session.stop()
             return False
 
@@ -98,13 +113,14 @@ class TcpClientRequestor(threading.Thread):
             # Return an error JSON in response.
             self.dispatcher.push_response({"error": "syntax error", "request": raw_command})
         else:
-            self.dispatcher.push_request(self.session,command)
+            self.dispatcher.push_request(self.session, command)
 
         return True
 
+
 class TcpServer(threading.Thread):
 
-    def __init__(self, dispatcher, host, port):
+    def __init__(self, dispatcher, host, port, use_ssl, ssl_certfile, ssl_keyfile):
         self.shared = dispatcher.shared
         self.dispatcher = dispatcher.request_dispatcher
         threading.Thread.__init__(self)
@@ -112,20 +128,29 @@ class TcpServer(threading.Thread):
         self.host = host
         self.port = port
         self.lock = threading.Lock()
+        self.use_ssl = use_ssl
+        self.ssl_keyfile = ssl_keyfile
+        self.ssl_certfile = ssl_certfile
 
     def run(self):
-        print "TCP server started."
+        if self.use_ssl:
+            print_log("TCP/SSL server started.")
+        else:
+            print_log("TCP server started.")
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         sock.bind((self.host, self.port))
         sock.listen(1)
         while not self.shared.stopped():
-            session = TcpSession(*sock.accept())
-            client_req = TcpClientRequestor(self.dispatcher, session)
-            client_req.start()
+            try:
+                connection, address = sock.accept()
+                session = TcpSession(connection, address, use_ssl=self.use_ssl, ssl_certfile=self.ssl_certfile, ssl_keyfile=self.ssl_keyfile)
+            except BaseException, e:
+                error = str(e)
+                print_log("cannot start TCP session", error, address)
+                time.sleep(0.1)
+                continue
             self.dispatcher.add_session(session)
             self.dispatcher.collect_garbage()
-
-
-
-
+            client_req = TcpClientRequestor(self.dispatcher, session)
+            client_req.start()