apply modified patch from #130 (provided by @schneider42, fix #130)

ros · Feb 14, 2013 · 36860c3 · 36860c3
1 parent af8db08
commit 36860c3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 164 deletions.
diff --git a/tools/rosgraph/package.xml b/tools/rosgraph/package.xml
@@ -14,6 +14,7 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
+  <run_depend>python-netifaces</run_depend>
   <run_depend>python-rospkg</run_depend>
 
   <test_depend>python-mock</test_depend>

diff --git a/tools/rosgraph/src/rosgraph/ifaddrs.py b/tools/rosgraph/src/rosgraph/ifaddrs.py
diff --git a/tools/rosgraph/src/rosgraph/network.py b/tools/rosgraph/src/rosgraph/network.py
@@ -207,10 +207,10 @@ def get_local_addresses():
             except KeyError: pass
     elif _is_unix_like_platform():
         # unix-only branch
-        import ifaddrs
-        ifaces = ifaddrs.getifaddrs()
-        v4addrs = [addr['addr'] for iface in ifaces.values() if socket.AF_INET in iface for addr in iface[socket.AF_INET]]
-        v6addrs = [addr['addr'] for iface in ifaces.values() if socket.AF_INET6 in iface for addr in iface[socket.AF_INET6]]
+        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]]
         if use_ipv6():
             return v6addrs + v4addrs
         else: