NLnetLabs · DRiKE · May 12, 2023 · Mar 15, 2023 · Mar 15, 2023 · Mar 15, 2023
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "routecore"
-version = "0.2.1-dev"
+version = "0.4.0-dev"
 authors = ["The NLnet Labs RPKI team <rpki-team@nlnetlabs.nl>"]
 categories = ["network-programming"]
 description = "A Library with Building Blocks for BGP Routing"
@@ -13,6 +13,7 @@ license = "BSD-3-Clause"
 [dependencies]
 
 # Optional dependencies which, if included, introduce additional functionality.
+arbitrary = { version = "1", optional = true, features = ["derive"] }
 bcder = { version = "0.7.0", optional = true }
 serde = { version = "1.0.95", optional = true, features = ["derive"] }
 
@@ -22,14 +23,14 @@ chrono = { version = "0.4", optional = true }
 const-str = { version = "0.5.3", optional = true, features = ["case"] }
 log = { version = "0.4.17", optional = true }
 
-octseq = { git = "https://github.com/NLnetLabs/octseq", features = ["bytes"], optional = true }
+octseq = { version = "0.2.0", features = ["bytes"], optional = true }
 tokio = { version = "1", features = ["sync", "rt"], optional = true }
 
 [dev-dependencies]
 serde_test      = "1.0"
 
 [features]
-default = []
+default = ["octseq"]
 bgp = ["bytes", "log", "octseq", "const-str"]
 bmp = ["bgp", "bytes", "chrono", "log", "octseq"]
 std = []
diff --git a/Changelog.md b/Changelog.md
@@ -21,8 +21,8 @@ New
 * Added new `asn::SmallAsnSet` which, as, the name suggests, is supposed
   to hold a relatively small set of ASNs. ([#22])
 
-[#14]: https://github.com/NLnetLabs/routecore/pull/14
-[#22]: https://github.com/NLnetLabs/routecore/pull/22
+* Added implementations for the `arbitrary::Arbitrary` trait to ASN and IP
+  resource types. ([#24])
 
 Bug fixes
 
@@ -32,6 +32,10 @@ Other changes
 * Changed the the minimal supported Rust version to 1.65, as the parsing of
   BGP and BMP messages relies on GATs.
 
+[#14]: https://github.com/NLnetLabs/routecore/pull/14
+[#22]: https://github.com/NLnetLabs/routecore/pull/22
+[#24]: https://github.com/NLnetLabs/routecore/pull/24
+
 
 ## 0.2.0
 

diff --git a/src/addr.rs b/src/addr.rs
@@ -22,6 +22,7 @@ use std::str::FromStr;
 /// There is no way of distinguishing between IPv4 and IPv6 from just a value
 /// of this type. This information needs to be carried separately.
 #[derive(Clone, Copy, Eq, Hash, Ord, PartialEq, PartialOrd)]
+#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
 struct Bits(u128);
 
 impl Bits {
@@ -202,6 +203,23 @@ impl FamilyAndLen {
     }
 }
 
+#[cfg(feature = "arbitrary")]
+impl<'a> arbitrary::Arbitrary<'a> for FamilyAndLen {
+    fn arbitrary(
+        u: &mut arbitrary::Unstructured<'a>
+    ) -> arbitrary::Result<Self> {
+        if bool::arbitrary(u)? {
+            Ok(Self(u8::arbitrary(u)? % 33))
+        }
+        else {
+            match u8::arbitrary(u)? % 129 {
+                128 => Ok(Self(0x40)),
+                val => Ok(Self(val ^ 0xFF))
+            }
+        }
+    }
+}
+
 
 //------------ Prefix --------------------------------------------------------
 
@@ -511,6 +529,26 @@ impl fmt::Display for Prefix {
 }
 
 
+//--- Arbitrary
+
+#[cfg(feature = "arbitrary")]
+impl<'a> arbitrary::Arbitrary<'a> for Prefix {
+    fn arbitrary(
+        u: &mut arbitrary::Unstructured<'a>
+    ) -> arbitrary::Result<Self> {
+        let fal = FamilyAndLen::arbitrary(u)?;
+        let mut bits = Bits::arbitrary(u)?;
+        if fal.is_v4() {
+            bits.0 <<= 96;
+        }
+        Ok(Self {
+            family_and_len: fal,
+            bits: bits.clear_host(fal.len())
+        })
+    }
+}
+
+
 
 //------------ MaxLenPrefix --------------------------------------------------
 
@@ -532,6 +570,7 @@ impl fmt::Display for Prefix {
 /// that, we can safely order 'any max_len' before 'no max_len' for equal
 /// prefixes.
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
 pub struct MaxLenPrefix {
     /// The prefix.
     prefix: Prefix,