Merge pull request #53 from frenzymadness/fix_multiple_ipv4_addrs_bug

Fix multiple ipv4 addrs bug

Author: frenzymadness

.travis.yml

@@ -19,5 +19,23 @@ cache:
     - $HOME/virtualenv/python$TRAVIS_PYTHON_VERSION/bin
 notifications:
   email: false
-install: pip install --upgrade tox tox-travis
+install:
+- pip install --upgrade tox tox-travis
+- sudo ip link add dummy1 type dummy
+- sudo ip link add dummy4 type dummy
+- sudo ip addr add 203.0.113.1 broadcast 203.0.113.255 dev dummy4
+- sudo ip addr add 198.51.100.1 broadcast 198.51.100.255 dev dummy4
+- sudo ip link set dummy1 up
+- sudo ip link set dummy4 up
+# Be ready for IPv6
+# - sudo ip link add dummy46 type dummy
+# - sudo ip addr add 203.0.113.10 broadcast 203.0.113.255 dev dummy46
+# - sudo ip addr add 198.51.100.10 broadcast 198.51.100.255 dev dummy46
+# - sudo ip addr add 2001:db8::10/64 dev dummy46
+# - sudo ip addr add 2001:db9::10/64 dev dummy46
+# - sudo ip link add dummy6 type dummy
+# - sudo ip addr add 2001:db8::1/64 dev dummy6
+# - sudo ip addr add 2001:db9::1/64 dev dummy6
+# - sudo ip link set dummy6 up
+# - sudo ip link set dummy46 up
 script: tox

scripts/pifconfig

@@ -17,10 +17,17 @@
 from __future__ import unicode_literals, print_function
 
 import ethtool
+import socket
+import struct
 import sys
 from optparse import OptionParser
 
 
+def bits2netmask(bits):
+    mask = (1 << 32) - (1 << 32 >> bits)
+    return socket.inet_ntoa(struct.pack(">L", mask))
+
+
 def flags2str(flags):
     string = ''
     if flags & ethtool.IFF_UP:
@@ -60,24 +67,19 @@ def flags2str(flags):
 
 
 def show_config(device):
-    try:
-        ipaddr = ethtool.get_ipaddr(device)
-        netmask = ethtool.get_netmask(device)
-        broadcast = ethtool.get_broadcast(device)
-    except (IOError, OSError):
-        ipaddr, netmask, broadcast = None, None, None
     flags = ethtool.get_flags(device)
-    print('%s' % device)
-    if not (flags & ethtool.IFF_LOOPBACK):
-        print('\tHWaddr %s' % ethtool.get_hwaddr(device))
-    if ipaddr is not None:
-        print('\tinet addr:%s' % ipaddr)
-    if broadcast is not None and \
-       not (flags & (ethtool.IFF_LOOPBACK | ethtool.IFF_POINTOPOINT)):
-        print('\tBcast:%s' % broadcast)
-    if netmask is not None:
-        print('\tMask:%s' % netmask)
+
     for info in ethtool.get_interfaces_info(device):
+        print(device)
+        if not (flags & ethtool.IFF_LOOPBACK):
+                print('\tHWaddr %s' % ethtool.get_hwaddr(device))
+
+        for addr in info.get_ipv4_addresses():
+            print('\tinet addr:%s' % addr.address, end=" ")
+            if not (flags & (ethtool.IFF_LOOPBACK | ethtool.IFF_POINTOPOINT)):
+                print('Bcast:%s' % addr.broadcast, end=" ")
+            print('Mask:%s' % bits2netmask(addr.netmask))
+
         for addr in info.get_ipv6_addresses():
             print('\tinet6 addr: %s/%s Scope: %s'
                   % (addr.address,

tests/test_ethtool.py

@@ -175,17 +175,20 @@ def _verify_etherinfo_object(self, ei):
             scraped = None
 
         self.assertIsStringOrNone(ei.ipv4_address)
-        if scraped:
-            self.assertEqual(ei.ipv4_address, scraped.inet)
+        if scraped and scraped.inet:
+            addresses = [ip.address for ip in ei.get_ipv4_addresses()]
+            self.assertTrue(scraped.inet in addresses)
 
         self.assertIsStringOrNone(ei.ipv4_broadcast)
-        if scraped and scraped.broadcast:
+        if scraped and scraped.broadcast not in (None, '0.0.0.0'):
             # Broadcast is optional
-            self.assertEqual(ei.ipv4_broadcast, scraped.broadcast)
+            broadcasts = [ip.broadcast for ip in ei.get_ipv4_addresses()]
+            self.assertTrue(scraped.broadcast in broadcasts)
 
         self.assertIsInt(ei.ipv4_netmask)
-        if scraped:
-            self.assertEqual(ei.ipv4_netmask, scraped.get_netmask_bits())
+        if scraped and scraped.netmask:
+            netmasks = [ip.netmask for ip in ei.get_ipv4_addresses()]
+            self.assertTrue(scraped.get_netmask_bits(), netmasks)
 
         self.assertIsStringOrNone(ei.mac_address)
         if scraped and scraped.hwaddr and scraped.hwtitle.lower() != 'unspec':