ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-24 15:16:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move UDP listen inside try block

Browse Source
This commit is contained in:
Matt Hazinski 2014-12-29 20:21:24 -05:00
parent e4149496d2
commit 4a18f03960
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/allmydata/util/iputil.py
View File

@ -6,6 +6,7 @@ from sys import platform
# from Twisted # from Twisted
from twisted.internet import defer, threads, reactor from twisted.internet import defer, threads, reactor
from twisted.internet.protocol import DatagramProtocol from twisted.internet.protocol import DatagramProtocol
from twisted.internet.error import CannotListenError
from twisted.python.procutils import which from twisted.python.procutils import which
from twisted.python import log from twisted.python import log
@ -125,16 +126,17 @@ def get_local_ip_for(target):
# avoid this DNS lookup. This also makes node startup fractionally # avoid this DNS lookup. This also makes node startup fractionally
# faster. # faster.
return None return None
udpprot = DatagramProtocol()
port = reactor.listenUDP(0, udpprot)
try: try:
udpprot = DatagramProtocol()
port = reactor.listenUDP(0, udpprot)
udpprot.transport.connect(target_ipaddr, 7) udpprot.transport.connect(target_ipaddr, 7)
localip = udpprot.transport.getHost().host localip = udpprot.transport.getHost().host
except socket.error: d = port.stopListening()
d.addErrback(log.err)
except (socket.error, CannotListenError):
# no route to that host # no route to that host
localip = None localip = None
d = port.stopListening()
d.addErrback(log.err)
return localip return localip