leyoda/dbus-settings-bindings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prefixes are u32

Browse source
This commit is contained in:
Lucy 2022-02-09 13:23:12 -05:00
parent 4f28c3c02b
commit 6d32b4c247
No known key found for this signature in database
GPG key ID: EBC517FAD666BBF1
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
networkmanager/src/config/ip4.rs
View file

@ -34,7 +34,7 @@ impl<'a> Ipv4Config<'a> {
let address_str = address_str.downcast_ref::<zvariant::Str>()?; let address_str = address_str.downcast_ref::<zvariant::Str>()?;
Ipv4Addr::from_str(address_str).ok()? Ipv4Addr::from_str(address_str).ok()?
}; };
let prefix = u64::try_from(map.remove("prefix")?).ok()? as usize; let prefix = u32::try_from(map.remove("prefix")?).ok()?;
Some(AddressData { address, prefix }) Some(AddressData { address, prefix })
}) })
.collect()) .collect())
@ -58,5 +58,5 @@ impl<'a> From<Ipv4ConfigProxy<'a>> for Ipv4Config<'a> {
#[derive(Debug, Copy, Clone, PartialEq, Eq)] #[derive(Debug, Copy, Clone, PartialEq, Eq)]
pub struct AddressData { pub struct AddressData {
pub address: Ipv4Addr, pub address: Ipv4Addr,
pub prefix: usize, pub prefix: u32,
} }

4
networkmanager/src/config/ip6.rs
View file

@ -32,7 +32,7 @@ impl<'a> Ipv6Config<'a> {
let address_str = address_str.downcast_ref::<zvariant::Str>()?; let address_str = address_str.downcast_ref::<zvariant::Str>()?;
Ipv6Addr::from_str(address_str).ok()? Ipv6Addr::from_str(address_str).ok()?
}; };
let prefix = u64::try_from(map.remove("prefix")?).ok()? as usize; let prefix = u32::try_from(map.remove("prefix")?).ok()?;
Some(AddressData { address, prefix }) Some(AddressData { address, prefix })
}) })
.collect()) .collect())
@ -56,5 +56,5 @@ impl<'a> From<Ipv6ConfigProxy<'a>> for Ipv6Config<'a> {
#[derive(Debug, Copy, Clone, PartialEq, Eq)] #[derive(Debug, Copy, Clone, PartialEq, Eq)]
pub struct AddressData { pub struct AddressData {
pub address: Ipv6Addr, pub address: Ipv6Addr,
pub prefix: usize, pub prefix: u32,
} }