Merge pull request containers#269 from Luap99/ipnet

bridge/macvlan: use IpNet::new() to create subnet
Luap99 · Mar 28, 2022 · 4e2f6af · 4e2f6af
2 parents 0e4440a + 1522b20
commit 4e2f6af
Showing 1 changed file with 22 additions and 52 deletions.
diff --git a/src/network/core.rs b/src/network/core.rs
@@ -93,33 +93,18 @@ impl Core {
         for (idx, subnet) in network.subnets.iter().flatten().enumerate() {
             let subnet_mask_cidr = subnet.subnet.prefix_len();
             if let Some(gw) = subnet.gateway {
-                let gw_net = match gw {
-                    IpAddr::V4(gw4) => match ipnet::Ipv4Net::new(gw4, subnet_mask_cidr) {
-                        Ok(dest) => ipnet::IpNet::from(dest),
-                        Err(err) => {
-                            return Err(std::io::Error::new(
-                                std::io::ErrorKind::Other,
-                                format!(
-                                    "failed to parse address {}/{}: {}",
-                                    gw4, subnet_mask_cidr, err
-                                ),
-                            ))
-                        }
-                    },
-                    IpAddr::V6(gw6) => match ipnet::Ipv6Net::new(gw6, subnet_mask_cidr) {
-                        Ok(dest) => ipnet::IpNet::from(dest),
-                        Err(err) => {
-                            return Err(std::io::Error::new(
-                                std::io::ErrorKind::Other,
-                                format!(
-                                    "failed to parse address {}/{}: {}",
-                                    gw6, subnet_mask_cidr, err
-                                ),
-                            ))
-                        }
-                    },
+                let gw_net = match ipnet::IpNet::new(gw, subnet_mask_cidr) {
+                    Ok(dest) => dest,
+                    Err(err) => {
+                        return Err(std::io::Error::new(
+                            std::io::ErrorKind::Other,
+                            format!(
+                                "failed to parse address {}/{}: {}",
+                                gw, subnet_mask_cidr, err
+                            ),
+                        ))
+                    }
                 };
-
                 gw_ipaddr_vector.push(gw_net)
             }
 
@@ -394,33 +379,18 @@ impl Core {
             // Only add gateway to route if macvlan is not marked as an internal network
             if !network.internal {
                 if let Some(gw) = subnet.gateway {
-                    let gw_net = match gw {
-                        IpAddr::V4(gw4) => match ipnet::Ipv4Net::new(gw4, subnet_mask_cidr) {
-                            Ok(dest) => ipnet::IpNet::from(dest),
-                            Err(err) => {
-                                return Err(std::io::Error::new(
-                                    std::io::ErrorKind::Other,
-                                    format!(
-                                        "failed to parse address gateway address while configuring macvlan {}/{}: {}",
-                                        gw4, subnet_mask_cidr, err
-                                    ),
-                                ))
-                            }
-                        },
-                        IpAddr::V6(gw6) => match ipnet::Ipv6Net::new(gw6, subnet_mask_cidr) {
-                            Ok(dest) => ipnet::IpNet::from(dest),
-                            Err(err) => {
-                                return Err(std::io::Error::new(
-                                    std::io::ErrorKind::Other,
-                                    format!(
-                                        "failed to parse address gateway address while configuring macvlan {}/{}: {}",
-                                        gw6, subnet_mask_cidr, err
-                                    ),
-                                ))
-                            }
-                        },
+                    let gw_net = match ipnet::IpNet::new(gw, subnet_mask_cidr) {
+                        Ok(dest) => dest,
+                        Err(err) => {
+                            return Err(std::io::Error::new(
+                                std::io::ErrorKind::Other,
+                                format!(
+                                    "failed to parse address {}/{}: {}",
+                                    gw, subnet_mask_cidr, err
+                                ),
+                            ))
+                        }
                     };
-
                     gw_ipaddr_vector.push(gw_net)
                 }
             }