Skip to content

Fix network handling. #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Barre wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix network handling. #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 15 additions & 19 deletions src/ipv4.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,13 @@ impl Ipv4Network {
}
}

pub fn ip(&self) -> Ipv4Addr {
self.addr
}

pub fn prefix(&self) -> u8 {
self.prefix
}

/// Checks if the given `Ipv4Network` is a subnet of the other.
pub fn is_subnet_of(self, other: Ipv4Network) -> bool {
other.ip() <= self.ip() && other.broadcast() >= self.broadcast()
other.network() <= self.network() && other.broadcast() >= self.broadcast()
}

/// Checks if the given `Ipv4Network` is a supernet of the other.
Expand All @@ -90,9 +86,9 @@ impl Ipv4Network {

/// Checks if the given `Ipv4Network` is partly contained in other.
pub fn overlaps(self, other: Ipv4Network) -> bool {
other.contains(self.ip())
other.contains(self.network())
|| (other.contains(self.broadcast())
|| (self.contains(other.ip()) || (self.contains(other.broadcast()))))
|| (self.contains(other.network()) || (self.contains(other.broadcast()))))
}

/// Returns the mask for this `Ipv4Network`.
Expand Down Expand Up @@ -217,7 +213,7 @@ impl Ipv4Network {

impl fmt::Display for Ipv4Network {
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(fmt, "{}/{}", self.ip(), self.prefix())
write!(fmt, "{}/{}", self.network(), self.prefix())
}
}

Expand All @@ -231,7 +227,7 @@ impl fmt::Display for Ipv4Network {
///
/// let new = Ipv4Network::new(Ipv4Addr::new(10, 1, 9, 32), 16).unwrap();
/// let from_cidr: Ipv4Network = "10.1.9.32/16".parse().unwrap();
/// assert_eq!(new.ip(), from_cidr.ip());
/// assert_eq!(new.network(), from_cidr.network());
/// assert_eq!(new.prefix(), from_cidr.prefix());
/// ```
impl FromStr for Ipv4Network {
Expand Down Expand Up @@ -327,21 +323,21 @@ mod test {
#[test]
fn parse_v4_24bit() {
let cidr: Ipv4Network = "127.1.0.0/24".parse().unwrap();
assert_eq!(cidr.ip(), Ipv4Addr::new(127, 1, 0, 0));
assert_eq!(cidr.network(), Ipv4Addr::new(127, 1, 0, 0));
assert_eq!(cidr.prefix(), 24);
}

#[test]
fn parse_v4_32bit() {
let cidr: Ipv4Network = "127.0.0.0/32".parse().unwrap();
assert_eq!(cidr.ip(), Ipv4Addr::new(127, 0, 0, 0));
assert_eq!(cidr.network(), Ipv4Addr::new(127, 0, 0, 0));
assert_eq!(cidr.prefix(), 32);
}

#[test]
fn parse_v4_noprefix() {
let cidr: Ipv4Network = "127.0.0.0".parse().unwrap();
assert_eq!(cidr.ip(), Ipv4Addr::new(127, 0, 0, 0));
assert_eq!(cidr.network(), Ipv4Addr::new(127, 0, 0, 0));
assert_eq!(cidr.prefix(), 32);
}

Expand All @@ -363,13 +359,6 @@ mod test {
assert_eq!(None, cidr);
}

#[test]
fn parse_v4_non_zero_host_bits() {
let cidr: Ipv4Network = "10.1.1.1/24".parse().unwrap();
assert_eq!(cidr.ip(), Ipv4Addr::new(10, 1, 1, 1));
assert_eq!(cidr.prefix(), 24);
}

#[test]
fn parse_v4_fail_prefix() {
let cidr: Option<Ipv4Network> = "0/39".parse().ok();
Expand Down Expand Up @@ -557,6 +546,13 @@ mod test {
),
true,
);
test_cases.insert(
(
"10.0.0.0/30".parse().unwrap(),
"10.0.0.1/24".parse().unwrap(),
),
true,
);
test_cases.insert(
(
"10.0.0.0/30".parse().unwrap(),
Expand Down
21 changes: 10 additions & 11 deletions src/ipv6.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,17 +112,13 @@ impl Ipv6Network {
Ipv6Addr::from(broadcast)
}

pub fn ip(&self) -> Ipv6Addr {
self.addr
}

pub fn prefix(&self) -> u8 {
self.prefix
}

/// Checks if the given `Ipv6Network` is a subnet of the other.
pub fn is_subnet_of(self, other: Ipv6Network) -> bool {
other.ip() <= self.ip() && other.broadcast() >= self.broadcast()
other.network() <= self.network() && other.broadcast() >= self.broadcast()
}

/// Checks if the given `Ipv6Network` is a supernet of the other.
Expand All @@ -132,9 +128,9 @@ impl Ipv6Network {

/// Checks if the given `Ipv6Network` is partly contained in other.
pub fn overlaps(self, other: Ipv6Network) -> bool {
other.contains(self.ip())
other.contains(self.network())
|| (other.contains(self.broadcast())
|| (self.contains(other.ip()) || (self.contains(other.broadcast()))))
|| (self.contains(other.network()) || (self.contains(other.broadcast()))))
}

/// Returns the mask for this `Ipv6Network`.
Expand Down Expand Up @@ -258,7 +254,7 @@ impl IntoIterator for &'_ Ipv6Network {

impl fmt::Display for Ipv6Network {
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(fmt, "{}/{}", self.ip(), self.prefix())
write!(fmt, "{}/{}", self.network(), self.prefix())
}
}

Expand Down Expand Up @@ -326,21 +322,24 @@ mod test {
#[test]
fn parse_v6() {
let cidr: Ipv6Network = "::1/0".parse().unwrap();
assert_eq!(cidr.ip(), Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1));
assert_eq!(cidr.network(), Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0));
assert_eq!(cidr.prefix(), 0);
}

#[test]
fn parse_v6_2() {
let cidr: Ipv6Network = "FF01:0:0:17:0:0:0:2/64".parse().unwrap();
assert_eq!(cidr.ip(), Ipv6Addr::new(0xff01, 0, 0, 0x17, 0, 0, 0, 0x2));
assert_eq!(
cidr.network(),
Ipv6Addr::new(0xff01, 0, 0, 0x17, 0, 0, 0, 0)
);
assert_eq!(cidr.prefix(), 64);
}

#[test]
fn parse_v6_noprefix() {
let cidr: Ipv6Network = "::1".parse().unwrap();
assert_eq!(cidr.ip(), Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1));
assert_eq!(cidr.network(), Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1));
assert_eq!(cidr.prefix(), 128);
}

Expand Down
8 changes: 0 additions & 8 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,6 @@ impl IpNetwork {
Self::new(netaddr, prefix)
}

/// Returns the IP part of a given `IpNetwork`
pub fn ip(&self) -> IpAddr {
match *self {
IpNetwork::V4(ref a) => IpAddr::V4(a.ip()),
IpNetwork::V6(ref a) => IpAddr::V6(a.ip()),
}
}

/// Returns the prefix of the given `IpNetwork`
///
/// # Example
Expand Down
16 changes: 8 additions & 8 deletions tests/test_json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ mod tests {

let mystruct: MyStruct = ::serde_json::from_str(json_string).unwrap();

assert_eq!(mystruct.ipnetwork.ip(), Ipv4Addr::new(127, 1, 0, 0));
assert_eq!(mystruct.ipnetwork.network(), Ipv4Addr::new(127, 1, 0, 0));
assert_eq!(mystruct.ipnetwork.prefix(), 24);

assert_eq!(::serde_json::to_string(&mystruct).unwrap(), json_string);
}

#[test]
fn test_ipv6_json() {
let json_string = r#"{"ipnetwork":"::1/0"}"#;
let json_string = r#"{"ipnetwork":"::/0"}"#;

#[derive(Serialize, Deserialize)]
struct MyStruct {
Expand All @@ -35,8 +35,8 @@ mod tests {
let mystruct: MyStruct = ::serde_json::from_str(json_string).unwrap();

assert_eq!(
mystruct.ipnetwork.ip(),
Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)
mystruct.ipnetwork.network(),
Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0)
);
assert_eq!(mystruct.ipnetwork.prefix(), 0);

Expand All @@ -45,7 +45,7 @@ mod tests {

#[test]
fn test_ipnetwork_json() {
let json_string = r#"{"ipnetwork":["127.1.0.0/24","::1/0"]}"#;
let json_string = r#"{"ipnetwork":["127.1.0.0/24","::/0"]}"#;

#[derive(Serialize, Deserialize)]
struct MyStruct {
Expand All @@ -54,11 +54,11 @@ mod tests {

let mystruct: MyStruct = ::serde_json::from_str(json_string).unwrap();

assert_eq!(mystruct.ipnetwork[0].ip(), Ipv4Addr::new(127, 1, 0, 0));
assert_eq!(mystruct.ipnetwork[0].network(), Ipv4Addr::new(127, 1, 0, 0));
assert_eq!(mystruct.ipnetwork[0].prefix(), 24);
assert_eq!(
mystruct.ipnetwork[1].ip(),
Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)
mystruct.ipnetwork[1].network(),
Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0)
);
assert_eq!(mystruct.ipnetwork[1].prefix(), 0);

Expand Down