Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

catch ValueError on netifaces.ifaddresses(), cleanup disabled code #213

Merged
merged 1 commit into from
Apr 9, 2013
Merged

catch ValueError on netifaces.ifaddresses(), cleanup disabled code #213

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 17 additions & 29 deletions tools/rosgraph/src/rosgraph/network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,6 @@
else:
SIOCGIFCONF = 0xc0086924

if 0:
# disabling netifaces as it accounts for 50% of startup latency
try:
import netifaces
_use_netifaces = True
except:
# NOTE: in rare cases, I've seen Python fail to extract the egg
# cache when launching multiple python nodes. Thus, we do
# except-all instead of except ImportError (kwc).
_use_netifaces = False
else:
_use_netifaces = False

logger = logging.getLogger('rosgraph.network')

def parse_http_host_and_port(url):
Expand Down Expand Up @@ -195,26 +182,27 @@ def get_local_addresses():
return _local_addrs

local_addrs = None
if _use_netifaces:
# #552: netifaces is a more robust package for looking up
# #addresses on multiple platforms (OS X, Unix, Windows)
# TODO IPV6: test netifaces with ipv6
local_addrs = []
# see http://alastairs-place.net/netifaces/
for i in netifaces.interfaces():
try:
local_addrs.extend([d['addr'] for d in netifaces.ifaddresses(i)[netifaces.AF_INET]])
except KeyError: pass
elif _is_unix_like_platform():
if _is_unix_like_platform():
# unix-only branch
v4addrs = []
v6addrs = []
import netifaces
ifaces = netifaces.interfaces()
v4addrs = [addr['addr'] for iface in ifaces if socket.AF_INET in netifaces.ifaddresses(iface) for addr in netifaces.ifaddresses(iface)[socket.AF_INET]]
v6addrs = [addr['addr'] for iface in ifaces if socket.AF_INET6 in netifaces.ifaddresses(iface) for addr in netifaces.ifaddresses(iface)[socket.AF_INET6]]
for iface in netifaces.interfaces():
try:
ifaddrs = netifaces.ifaddresses(iface)
except ValueError:
# even if interfaces() returns an interface name
# ifaddresses() might raise a ValueError
# https://bugs.launchpad.net/ubuntu/+source/netifaces/+bug/753009
continue
if socket.AF_INET in ifaddrs:
v4addrs.extend([addr['addr'] for addr in ifaddrs[socket.AF_INET]])
if socket.AF_INET6 in ifaddrs:
v6addrs.extend([addr['addr'] for addr in ifaddrs[socket.AF_INET6]])
if use_ipv6():
return v6addrs + v4addrs
local_addrs = v6addrs + v4addrs
else:
return v4addrs
local_addrs = v4addrs
else:
# cross-platform branch, can only resolve one address
if use_ipv6():
Expand Down