Skip to content

fix nondeterministic ordering in canonicalize_sources test #231

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

Merged
zeeshanlakhani merged 1 commit into from
Feb 27, 2026
Merged

fix nondeterministic ordering in canonicalize_sources test #231

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
11 changes: 10 additions & 1 deletion dpd-types/src/mcast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,16 @@ impl FromStr for UnderlayMulticastIpv6 {
/// For SSM groups, use `Exact` with specific source addresses.
/// For ASM groups with any-source filtering, use `Any`.
#[derive(
Clone, Debug, PartialEq, Eq, Hash, Deserialize, Serialize, JsonSchema,
Clone,
Debug,
PartialEq,
Eq,
PartialOrd,
Ord,
Hash,
Deserialize,
Serialize,
JsonSchema,
)]
pub enum IpSrc {
/// Exact match for the source IP address.
Expand Down
13 changes: 8 additions & 5 deletions dpd/src/mcast/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
//! [RFC 4291]: https://www.rfc-editor.org/rfc/rfc4291.html

use std::{
collections::{BTreeMap, HashSet},
collections::{BTreeMap, BTreeSet, HashSet},
net::{IpAddr, Ipv4Addr, Ipv6Addr},
ops::Bound,
sync::{Arc, Mutex, Weak},
Expand Down Expand Up @@ -1206,7 +1206,7 @@ fn canonicalize_sources(sources: Option<Vec<IpSrc>>) -> Option<Vec<IpSrc>> {
Some(srcs) if srcs.is_empty() || sources_contain_any(&srcs) => None,
Some(srcs) => {
let deduped: Vec<IpSrc> =
srcs.into_iter().collect::<HashSet<_>>().into_iter().collect();
srcs.into_iter().collect::<BTreeSet<_>>().into_iter().collect();
Some(deduped)
}
}
Expand Down Expand Up @@ -2321,14 +2321,17 @@ mod tests {
None
);

// Vec with only Exact sources stays as-is
// Vec with only Exact sources is deduplicated and sorted
let exact_sources = vec![
IpSrc::Exact(IpAddr::V4(Ipv4Addr::new(192, 168, 1, 1))),
IpSrc::Exact(IpAddr::V4(Ipv4Addr::new(10, 0, 0, 1))),
];
assert_eq!(
canonicalize_sources(Some(exact_sources.clone())),
Some(exact_sources)
canonicalize_sources(Some(exact_sources)),
Some(vec![
IpSrc::Exact(IpAddr::V4(Ipv4Addr::new(10, 0, 0, 1))),
IpSrc::Exact(IpAddr::V4(Ipv4Addr::new(192, 168, 1, 1))),
])
);

// Single Exact source stays as-is
Expand Down