import time
import Queue as queue
-from processor import Session, Dispatcher, timestr
+from processor import Session, Dispatcher, print_log
class TcpSession(Session):
- def __init__(self, connection, address):
+ def __init__(self, connection, address, use_ssl, ssl_certfile, ssl_keyfile):
Session.__init__(self)
- self._connection = connection
+ 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 session"
+ self.name = "TCP"
def connection(self):
if self.stopped():
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()
if not self.update():
break
+ self.session.time = time.time()
+
while self.parse():
pass
def receive(self):
try:
- return self.session.connection().recv(1024)
+ return self.session.connection().recv(2048)
except:
return ''
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)
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()
+ session = TcpSession(*sock.accept(), use_ssl=self.use_ssl, ssl_certfile=self.ssl_certfile, ssl_keyfile=self.ssl_keyfile)
self.dispatcher.add_session(session)
self.dispatcher.collect_garbage()
-
-
-
+ client_req = TcpClientRequestor(self.dispatcher, session)
+ client_req.start()