Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-03 01:39:23 +01:00
Code Issues Projects Releases Wiki Activity

Should fix bugs #858964 #862544.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-01-01 20:09:35 +00:00
parent a7d0eb9829
commit 8895ffdc1c
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/DCC.py
View File

@ -41,6 +41,7 @@ import socket
import textwrap
import threading
import conf
import utils
import world
import ircmsgs
@ -70,7 +71,17 @@ class DCC(callbacks.Privmsg):
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.settimeout(60)
host = ircutils.hostFromHostmask(irc.prefix)
ip = socket.gethostbyname(host)
if conf.externalIP is not None:
ip = conf.externalIP
else:
try:
ip = socket.gethostbyname(host)
except socket.error, e:
s = 'Error trying to determine the external IP ' \
'address of this machine via the host %s: %s'
self.log.warning(s, host, e)
irc.reply(msg, conf.replyError)
return
i = ircutils.dccIP(ip)
sock.bind((host, 0))
port = sock.getsockname()[1]