nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Socket connection can now be made in IPv6

Browse Source
This commit is contained in:
nemunaire 2015-04-26 08:02:37 +02:00
parent 0fb58f0ff2
commit 40ff3d6eda
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nemubot/server/socket.py
View File

@ -48,17 +48,9 @@ class SocketServer(AbstractServer):
def _open(self): def _open(self):
import os import os
import socket import socket
# Create the socket
self.socket = socket.socket()
# Wrap the socket for SSL
if self.ssl:
import ssl
ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
self.socket = ctx.wrap_socket(self.socket)
try: try:
self.socket.connect((self.host, self.port)) # Connect to server self.socket = socket.create_connection((self.host, self.port))
self.logger.info("Connected to %s:%d", self.host, self.port) self.logger.info("Connected to %s:%d", self.host, self.port)
except socket.error as e: except socket.error as e:
self.socket = None self.socket = None
@ -67,6 +59,12 @@ class SocketServer(AbstractServer):
os.strerror(e.errno)) os.strerror(e.errno))
return False return False
# Wrap the socket for SSL
if self.ssl:
import ssl
ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
self.socket = ctx.wrap_socket(self.socket)
return True return True