Work on 64-bit systems

seveas · seveas · commit e9164fcdbd14 · 2013-09-02T10:04:40.000+02:00
diff --git a/NetworkManager.py b/NetworkManager.py
@@ -342,7 +342,7 @@ def addrconf_to_dbus(addrconf):
         addr, netmask, gateway = addrconf
         return [
             fixups.addr_to_dbus(addr),
-            netmask,
+            fixups.mask_to_dbus(netmask),
             fixups.addr_to_dbus(gateway)
         ]
 
@@ -352,7 +352,11 @@ def addr_to_python(addr):
 
     @staticmethod
     def addr_to_dbus(addr):
-        return struct.unpack('I', socket.inet_aton(addr))
+        return dbus.UInt32(struct.unpack('I', socket.inet_aton(addr))[0])
+
+    @staticmethod
+    def mask_to_dbus(mask):
+        return dbus.UInt32(mask)
 
     @staticmethod
     def route_to_python(route):
@@ -369,7 +373,7 @@ def route_to_dbus(route):
         addr, netmask, gateway, metric = route
         return [
             fixups.addr_to_dbus(addr),
-            netmask,
+            fixups.mask_to_dbus(netmask),
             fixups.addr_to_dbus(gateway),
             socket.htonl(metric)
         ]
