import json
+import Queue as queue
import socket
import threading
import time
-import Queue as queue
+import traceback, sys
+
+from processor import Session, Dispatcher
+from utils import print_log
-from processor import Session, Dispatcher, timestr
class TcpSession(Session):
def __init__(self, connection, address, use_ssl, ssl_certfile, ssl_keyfile):
Session.__init__(self)
- print connection, address, use_ssl
+ self.use_ssl = use_ssl
if use_ssl:
import ssl
self._connection = ssl.wrap_socket(
server_side=True,
certfile=ssl_certfile,
keyfile=ssl_keyfile,
- ssl_version=ssl.PROTOCOL_TLSv1)
+ ssl_version=ssl.PROTOCOL_SSLv23,
+ do_handshake_on_connect=False)
else:
self._connection = connection
self.address = address[0]
- self.name = "TCP"
+ self.name = "TCP " if not use_ssl else "SSL "
+ self.response_queue = queue.Queue()
+
+ def do_handshake(self):
+ if self.use_ssl:
+ self._connection.do_handshake()
def connection(self):
if self.stopped():
return self._connection
def stop(self):
+ if self.stopped():
+ return
+
+ try:
+ self._connection.shutdown(socket.SHUT_RDWR)
+ except:
+ # print_log("problem shutting down", self.address)
+ # traceback.print_exc(file=sys.stdout)
+ pass
+
self._connection.close()
- #print "Terminating connection:", self.address
with self.lock:
self._stopped = True
def send_response(self, 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()
- while data:
- l = connection.send(data)
- data = data[l:]
- except:
- self.stop()
+ self.response_queue.put(response)
+
+
+class TcpClientResponder(threading.Thread):
+
+ def __init__(self, session):
+ self.session = session
+ threading.Thread.__init__(self)
+
+ def run(self):
+ while not self.session.stopped():
+ response = self.session.response_queue.get()
+ data = json.dumps(response) + "\n"
+ try:
+ while data:
+ l = self.session.connection().send(data)
+ data = data[l:]
+ except:
+ self.session.stop()
threading.Thread.__init__(self)
def run(self):
+ try:
+ self.session.do_handshake()
+ except:
+ return
+
while not self.shared.stopped():
if not self.update():
break
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
# 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, use_ssl, ssl_certfile, ssl_keyfile):
self.ssl_certfile = ssl_certfile
def run(self):
- print "TCP server started.", self.use_ssl
+ 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))
- sock.listen(1)
+ sock.listen(5)
+
while not self.shared.stopped():
- session = TcpSession(*sock.accept(), use_ssl=self.use_ssl, ssl_certfile=self.ssl_certfile, ssl_keyfile=self.ssl_keyfile)
+
+ #if self.use_ssl: print_log("SSL: socket listening")
+ try:
+ connection, address = sock.accept()
+ except:
+ traceback.print_exc(file=sys.stdout)
+ time.sleep(0.1)
+ continue
+
+ #if self.use_ssl: print_log("SSL: new session", address)
+ try:
+ 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)
+ connection.close()
+ time.sleep(0.1)
+ continue
+
self.dispatcher.add_session(session)
self.dispatcher.collect_garbage()
client_req = TcpClientRequestor(self.dispatcher, session)
client_req.start()
-
+ responder = TcpClientResponder(session)
+ responder.start()