Fixed several bugs and added a test to make sure they don't happen again.

plugins/DCC.py

@@ -37,10 +37,13 @@ import plugins
 
 import socket
 import textwrap
+import threading
 
+import debug
 import utils
 import world
 import ircmsgs
+import ircutils
 import privmsgs
 import callbacks
 
@@ -74,11 +77,7 @@ class DCC(callbacks.Privmsg):
                 sock.settimeout(60)
                 host = ircutils.hostFromHostmask(irc.prefix)
                 ip = socket.gethostbyname(host)
-                i = 0
+                i = ircutils.dccIP(ip)
-                x = 256*256*256
-                for quad in ip.split('.'):
-                    i += int(quad)*x
-                    x /= 256
                 sock.bind((host, 0))
                 port = sock.getsockname()[1]
                 debug.msg('DCC CHAT port opened at (%s, %s)' % (host, port),

test/test_DCC.py

@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+
+###
+# Copyright (c) 2002, Jeremiah Fincher
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright notice,
+#     this list of conditions, and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions, and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#   * Neither the name of the author of this software nor the name of
+#     contributors to this software may be used to endorse or promote products
+#     derived from this software without specific prior written consent.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+###
+
+from test import *
+
+import time
+import telnetlib
+
+import ircutils
+
+class DCCTestCase(PluginTestCase):
+    plugins = ('DCC', 'Utilities')
+    def testChat(self):
+        self.nick = 'foo'
+        self.prefix = 'foo!bar@baz'
+        self.irc.prefix = '%s!%s@localhost' % (self.irc.nick, self.irc.nick)
+        m = self.getMsg('chat [echo foo]')
+        time.sleep(.1) # Give it a second to bind the port.
+        self.failIf(ircutils.isChannel(m.args[0]))
+        s = m.args[1]
+        (ip, port) = s[15:-1].split()
+        ip = ircutils.unDccIP(long(ip))
+        port = int(port)
+        t = telnetlib.Telnet(ip, port)
+        self.assertEqual(t.read_all(), 'foo\n')
+
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+