dcc debugging

Author: bspkrs

DCCSocket.py

@@ -19,11 +19,11 @@ def __init__(self, bot, sock, sender):
         self.logger  = Logger.getLogger(__name__+".DCCHandler_"+sender.nick, bot.lognormal, bot.logerrors)
 
         self.use_ssl = bot.use_ssl
-        if self.use_ssl:
-            self.send = self._ssl_send
-            self.recv = self._ssl_recv
-
-        self.ssl = None
+        # if self.use_ssl:
+        #     self.send = self._ssl_send
+        #     self.recv = self._ssl_recv
+        #
+        # self.ssl = None
 
     def __del__(self):
         self.logger.info("Connection with %s timedout"%self.sender)
@@ -32,54 +32,54 @@ def __del__(self):
         self.close()
         #super(DCCHandler, self).__del__()
 
-    def _ssl_send(self, data):
-        """ Replacement for self.send() during SSL connections. """
-        try:
-            result = self.write(data)
-            return result
-        except ssl.SSLError, why:
-            if why[0] in (asyncore.EWOULDBLOCK, errno.ESRCH):
-                return 0
-            else:
-                raise ssl.SSLError, why
-
-    def _ssl_recv(self, buffer_size):
-        """ Replacement for self.recv() during SSL connections. """
-        try:
-            data = self.read(buffer_size)
-            if not data:
-                self.handle_close()
-                return ''
-            return data
-        except ssl.SSLError, why:
-            if why[0] in (asyncore.ECONNRESET, asyncore.ENOTCONN,
-                          asyncore.ESHUTDOWN):
-                self.handle_close()
-                return ''
-            elif why[0] == errno.ENOENT:
-                # Required in order to keep it non-blocking
-                return ''
-            else:
-                raise
-
-    def handle_connect(self):
-        """ Initializes SSL support after the connection has been made. """
-        self.logger.info("Connecting DCC Handler Socket...")
-        if self.use_ssl:
-            self.ssl = ssl.wrap_socket(self.socket, do_handshake_on_connect=False)
-            self.set_socket(self.ssl)
-            # Non-blocking handshake
-            while True:
-                try:
-                    self.ssl.do_handshake()
-                    break
-                except ssl.SSLError as err:
-                    if err.args[0] == ssl.SSL_ERROR_WANT_READ:
-                        select.select([self.ssl], [], [], 5.0)
-                    elif err.args[0] == ssl.SSL_ERROR_WANT_WRITE:
-                        select.select([], [self.ssl], [], 5.0)
-                    else:
-                        raise
+    # def _ssl_send(self, data):
+    #     """ Replacement for self.send() during SSL connections. """
+    #     try:
+    #         result = self.write(data)
+    #         return result
+    #     except ssl.SSLError, why:
+    #         if why[0] in (asyncore.EWOULDBLOCK, errno.ESRCH):
+    #             return 0
+    #         else:
+    #             raise ssl.SSLError, why
+    #
+    # def _ssl_recv(self, buffer_size):
+    #     """ Replacement for self.recv() during SSL connections. """
+    #     try:
+    #         data = self.read(buffer_size)
+    #         if not data:
+    #             self.handle_close()
+    #             return ''
+    #         return data
+    #     except ssl.SSLError, why:
+    #         if why[0] in (asyncore.ECONNRESET, asyncore.ENOTCONN,
+    #                       asyncore.ESHUTDOWN):
+    #             self.handle_close()
+    #             return ''
+    #         elif why[0] == errno.ENOENT:
+    #             # Required in order to keep it non-blocking
+    #             return ''
+    #         else:
+    #             raise
+
+    # def handle_connect(self):
+    #     """ Initializes SSL support after the connection has been made. """
+    #     self.logger.info("Connecting DCC Handler Socket...")
+    #     if self.use_ssl:
+    #         self.ssl = ssl.wrap_socket(self.socket, do_handshake_on_connect=False)
+    #         self.set_socket(self.ssl)
+    #         # Non-blocking handshake
+    #         while True:
+    #             try:
+    #                 self.ssl.do_handshake()
+    #                 break
+    #             except ssl.SSLError as err:
+    #                 if err.args[0] == ssl.SSL_ERROR_WANT_READ:
+    #                     select.select([self.ssl], [], [], 5.0)
+    #                 elif err.args[0] == ssl.SSL_ERROR_WANT_WRITE:
+    #                     select.select([], [self.ssl], [], 5.0)
+    #                 else:
+    #                     raise
 
     def sendMsg(self, msg):
         self.sendBuffer.put_nowait(msg + EOL)