try to get DCC to allow secure connections

Author: bspkrs

BotBase.py

@@ -397,7 +397,7 @@ def requestDCC(self, bot, sender, dest, cmd, args):
         if self.dccActive:
             host, port = self.dccSocket.getAddr()
             if self.dccSocket.addPending(sender):
-                self.sendRaw(CmdGenerator.getDCCCHAT(sender.nick, host, port))
+                self.sendRaw(CmdGenerator.getDCCCHAT(sender.nick, host, port, self.use_ssl))
         else:
             self.sendNotice(sender.nick, "§BDCC is not active on this bot.")
 

IRCHandler.py

@@ -137,8 +137,11 @@ def getWHOIS(cls, nick):
         return "WHOIS {nick}".format(nick = nick) + EOL
 
     @classmethod
-    def getDCCCHAT(cls, dest, addr, port):
-        ctcpmsg = CmdGenerator.getCTCP("DCC CHAT chat {addr} {port}".format(addr=CmdGenerator.conv_ip_std_long(addr), port=port))
+    def getDCCCHAT(cls, dest, addr, port, use_ssl):
+        if use_ssl:
+            ctcpmsg = CmdGenerator.getCTCP("DCC SCHAT chat {addr} {port}".format(addr=CmdGenerator.conv_ip_std_long(addr), port=port))
+        else:
+            ctcpmsg = CmdGenerator.getCTCP("DCC CHAT chat {addr} {port}".format(addr=CmdGenerator.conv_ip_std_long(addr), port=port))
         privmsg = CmdGenerator.getPRIVMSG(dest, ctcpmsg)
         return privmsg
 
@@ -147,9 +150,9 @@ def conv_ip_long_std(cls, longip):
         try:
             ip = long(longip)
         except ValueError:
-            return '0.0.0.0'
+            return longip
         if ip >= 2 ** 32:
-            return '0.0.0.0'
+            return longip
         address = [str(ip >> shift & 0xFF) for shift in [24, 16, 8, 0]]
         return '.'.join(address)
 
@@ -163,9 +166,9 @@ def conv_ip_std_long(cls, stdip):
             try:
                 ip_part = int(part)
             except ValueError:
-                return 0
+                return stdip
             if ip_part >= 2 ** 8:
-                return 0
+                return stdip
             longip += ip_part << shift
         return longip