Remove ipnetwork from the public API

Author: MarkusPettersson98

src/lib.rs

@@ -68,8 +68,6 @@ use std::{
     slice,
 };
 
-pub use ipnetwork;
-
 mod ffi;
 
 #[macro_use]

src/rule/ip.rs

@@ -12,7 +12,6 @@ use crate::{
     pooladdr::{PoolAddr, PoolAddrList},
     AddrFamily, Result,
 };
-use ipnetwork::{IpNetwork, Ipv4Network, Ipv6Network};
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
 
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
@@ -26,14 +25,19 @@ impl Ip {
     pub fn get_af(&self) -> AddrFamily {
         match *self {
             Ip::Any => AddrFamily::Any,
-            Ip::Net(IpNetwork::V4(_)) => AddrFamily::Ipv4,
-            Ip::Net(IpNetwork::V6(_)) => AddrFamily::Ipv6,
+            Ip::Net(network) => match network.0 {
+                ipnetwork::IpNetwork::V4(_) => AddrFamily::Ipv4,
+                ipnetwork::IpNetwork::V6(_) => AddrFamily::Ipv6,
+            },
         }
     }
 
     /// Returns `Ip::Any` represented an as an `IpNetwork`, used for ffi.
-    fn any_ffi_repr() -> IpNetwork {
-        IpNetwork::V6(Ipv6Network::new(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0), 0).unwrap())
+    const fn any_ffi_repr() -> IpNetwork {
+        let any = ipnetwork::IpNetwork::V6(
+            ipnetwork::Ipv6Network::new_checked(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0), 0).unwrap(),
+        );
+        IpNetwork(any)
     }
 
     /// Returns PoolAddrList initialized with receiver
@@ -42,6 +46,25 @@ impl Ip {
     }
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct IpNetwork(ipnetwork::IpNetwork);
+
+impl IpNetwork {
+    pub fn new(ip: IpAddr, prefix: u8) -> IpNetwork {
+        // TODO: Do not unwrap
+        let network = ipnetwork::IpNetwork::new(ip, prefix).unwrap();
+        IpNetwork(network)
+    }
+
+    pub fn ip(&self) -> IpAddr {
+        self.0.ip()
+    }
+
+    pub fn mask(&self) -> IpAddr {
+        self.0.mask()
+    }
+}
+
 impl From<IpNetwork> for Ip {
     fn from(net: IpNetwork) -> Self {
         Ip::Net(net)
@@ -50,13 +73,15 @@ impl From<IpNetwork> for Ip {
 
 impl From<Ipv4Addr> for Ip {
     fn from(ip: Ipv4Addr) -> Self {
-        Ip::Net(IpNetwork::V4(Ipv4Network::new(ip, 32).unwrap()))
+        let network = ipnetwork::IpNetwork::V4(ipnetwork::Ipv4Network::new(ip, 32).unwrap());
+        Ip::Net(IpNetwork(network))
     }
 }
 
 impl From<Ipv6Addr> for Ip {
     fn from(ip: Ipv6Addr) -> Self {
-        Ip::Net(IpNetwork::V6(Ipv6Network::new(ip, 128).unwrap()))
+        let network = ipnetwork::IpNetwork::V6(ipnetwork::Ipv6Network::new(ip, 128).unwrap());
+        Ip::Net(IpNetwork(network))
     }
 }
 

src/rule/mod.rs

@@ -10,7 +10,6 @@ use crate::{
     conversion::{CopyTo, TryCopyTo},
     ffi, Error, ErrorInternal, Result,
 };
-use ipnetwork::IpNetwork;
 use std::{
     net::{IpAddr, Ipv4Addr, Ipv6Addr},
     ops::Deref,