Add function to turn AddressRange into set of prefixes

src/repository/resources/ipres.rs

@@ -12,6 +12,7 @@ use std::fmt::Display;
 use std::net::{AddrParseError, IpAddr, Ipv4Addr, Ipv6Addr};
 use std::num::ParseIntError;
 use std::str::FromStr;
+use std::cmp;
 use bcder::{decode, encode};
 use bcder::{BitString, Mode, OctetString, Tag};
 use bcder::decode::{ContentError, DecodeError};
@@ -1037,6 +1038,65 @@ impl AddressRange {
         }
     }
 
+    /// Convert a range into a set of V6 prefixes
+    pub fn to_v6_prefixes(self) -> impl Iterator<Item = Prefix> {
+        let mut start = self.min.to_bits();
+        let end = self.max.to_bits();
+
+        std::iter::from_fn(move || {
+            if start > end {
+                return None;
+            }
+
+            let addr_host_bits = start.trailing_zeros();
+            let mut max_allowed = 128 - (start ^ end).leading_zeros();
+            if end.trailing_ones() < max_allowed {
+                max_allowed -= 1;
+            }
+
+            let same_bits = cmp::min(addr_host_bits, max_allowed);
+            let prefix_len = 128 - same_bits;
+
+            debug_assert!(prefix_len <= 128);
+            let prefix = Prefix::new(Addr::from_bits(start), prefix_len as u8);
+
+            start += 2_u128.pow(same_bits);
+
+            Some(prefix)
+        })
+    }
+
+    /// Convert a range into a set of V4 prefixes
+    pub fn to_v4_prefixes(self) -> impl Iterator<Item = Prefix> {
+        let mut start = (self.min.to_bits() >> 96) as u32;
+        let end = (self.max.to_bits() >> 96) as u32;
+
+        std::iter::from_fn(move || {
+            if start > end {
+                return None;
+            }
+
+            let addr_host_bits = start.trailing_zeros();
+            let mut max_allowed = 32 - (start ^ end).leading_zeros();
+            if end.trailing_ones() < max_allowed {
+                max_allowed -= 1;
+            }
+
+            let same_bits = cmp::min(addr_host_bits, max_allowed);
+            let prefix_len = 32 - same_bits;
+
+            debug_assert!(prefix_len <= 32);
+            let prefix = Prefix::new(
+                Addr::from(Ipv4Addr::from(start)), 
+                prefix_len as u8
+            );
+
+            start += 2u32.pow(same_bits);
+
+            Some(prefix)
+        })
+    }
+
     /// Formats the range as an IPv4 range.
     pub fn fmt_v4(self, f: &mut fmt::Formatter) -> fmt::Result {
         let min = self.min.to_v4();
@@ -2207,7 +2267,7 @@ impl From<OverclaimedIpv6Resources> for VerificationError {
 //============ Tests =========================================================
 
 #[cfg(test)]
-mod test {
+mod tests {
     use bcder::encode::Values;
     use super::*;
 
@@ -2658,6 +2718,30 @@ mod test {
             0x123f_ffff_ffff_ffff_ffff_ffff_ffff_ffff
         );
     }
+
+    #[test]
+    fn to_prefixes() {
+        {
+            let range = AddressRange::new(
+                Addr::from(Ipv6Addr::from_str("::1").unwrap()), 
+                Addr::from(Ipv6Addr::from_str("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fffe").unwrap())
+            );
+
+            let prefixes = range.to_v6_prefixes();
+
+            assert_eq!(254, prefixes.count());
+        }
+        {
+            let range = AddressRange::new(
+                Addr::from(Ipv4Addr::from_str("192.168.0.0").unwrap()), 
+                Addr::from(Ipv4Addr::from_str("192.168.2.255").unwrap())
+            );
+
+            let prefixes = range.to_v4_prefixes();
+
+            assert_eq!(2, prefixes.count());
+        }
+    }
 }
 
 #[cfg(all(test, feature="compat"))]

src/repository/resources/mod.rs

@@ -20,9 +20,9 @@ pub use self::asres::{
 };
 pub use self::choice::ResourcesChoice;
 pub use self::ipres::{
-    Addr, AddressFamily, InheritedIpResources, IpBlock, IpBlocks, Ipv4Block,
-    Ipv4Blocks, Ipv6Block, Ipv6Blocks, IpBlocksBuilder, IpBlocksForFamily,
-    IpResources, IpResourcesBuilder, OverclaimedIpResources,
+    Addr, AddressFamily, AddressRange, InheritedIpResources, IpBlock, IpBlocks,
+    Ipv4Block, Ipv4Blocks, Ipv6Block, Ipv6Blocks, IpBlocksBuilder,
+    IpBlocksForFamily, IpResources, IpResourcesBuilder, OverclaimedIpResources,
     OverclaimedIpv4Resources, OverclaimedIpv6Resources, Prefix
 };
 pub use self::set::{