Kieran/ipnetwork
1
0
Fork 0
mirror of https://github.com/achanda/ipnetwork.git synced 2025-06-16 16:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change return type of Ipv4Network::size to u32

Browse Source 
Also, generalize size over IpvNetwork
NOTE: this is a breaking change
This commit is contained in:
Abhishek Chanda
2018-11-21 15:48:29 +00:00
parent 2bd3db84a8
commit 2b21f38171
3 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ipv4.rs
View File

@ -49,7 +49,7 @@ impl Ipv4Network {
/// `Ipv4Addr` in the given network. `None` will be returned when there are no more
/// addresses.
pub fn iter(&self) -> Ipv4NetworkIterator {
let start = u64::from(u32::from(self.network()));
let start = u32::from(self.network());
let end = start + self.size();
Ipv4NetworkIterator { next: start, end }
}
@ -150,9 +150,9 @@ impl Ipv4Network {
/// let tinynet: Ipv4Network = "0.0.0.0/32".parse().unwrap();
/// assert_eq!(tinynet.size(), 1);
/// ```
pub fn size(&self) -> u64 {
pub fn size(&self) -> u32 {
let host_bits = u32::from(IPV4_BITS - self.prefix);
(2 as u64).pow(host_bits)
(2 as u32).pow(host_bits)
}
/// Returns the `n`:th address within this network.
@ -173,7 +173,7 @@ impl Ipv4Network {
/// assert_eq!(net2.nth(256).unwrap(), Ipv4Addr::new(10, 0, 1, 0));
/// ```
pub fn nth(&self, n: u32) -> Option<Ipv4Addr> {
if u64::from(n) < self.size() {
if n < self.size() {
let net = u32::from(self.network());
Some(Ipv4Addr::from(net + n))
} else {
@ -225,8 +225,8 @@ impl From<Ipv4Addr> for Ipv4Network {
}
pub struct Ipv4NetworkIterator {
next: u64,
end: u64,
next: u32,
end: u32,
}
impl Iterator for Ipv4NetworkIterator {