Skip to content

[multicast] default multicast feature across all crates #224

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

Draft
zeeshanlakhani wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

[multicast] default multicast feature across all crates #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e1bf51b
[mcast] default multicast feature across all crates + merge main (inc…
zeeshanlakhani Feb 27, 2026
0b8a5d7
merge main into multicast-e2e
zeeshanlakhani Mar 2, 2026
0224938
merge main
zeeshanlakhani Mar 5, 2026
1b4e6e2
merge main
zeeshanlakhani Mar 6, 2026
258d2be
remove redundant multicast-test CI job; multicast is now a default fe…
zeeshanlakhani Mar 6, 2026
e8a6811
merge main
zeeshanlakhani Mar 10, 2026
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
2 changes: 1 addition & 1 deletion .github/buildomat/jobs/image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ pfexec chown "$UID" /out

banner "P4 Codegen"
# Add gcc-12 so the p4 compiler can find cpp
PATH=/opt/gcc-12/bin:$PATH cargo xtask codegen --stages $TOFINO_STAGES
PATH=/opt/gcc-12/bin:$PATH cargo xtask codegen --stages $TOFINO_STAGES --multicast

# Preserve all the diagnostics spit out by the compiler
mkdir -p /out/p4c-diags
Expand Down
34 changes: 0 additions & 34 deletions .github/buildomat/jobs/multicast-test.sh
View file
Open in desktop

This file was deleted.

15 changes: 5 additions & 10 deletions .github/buildomat/packet-test-common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,11 @@ export WS=$wd
MODEL_STARTUP_TIMEOUT=${MODEL_STARTUP_TIMEOUT:=5}
STARTUP_TIMEOUT=${STARTUP_TIMEOUT:=120}

if [ x$MULTICAST == x ]; then
BUILD_FEATURES=tofino_asic
CODEGEN_FEATURES=
SWADM_FEATURES=
else
BUILD_FEATURES=tofino_asic,multicast
CODEGEN_FEATURES=--multicast
SWADM_FEATURES=--features=multicast
fi

BUILD_FEATURES=tofino_asic

CODEGEN_FEATURES=--multicast
SWADM_FEATURES="--features=multicast"

function cleanup {
set +o errexit
set +o pipefail
Expand Down
1 change: 1 addition & 0 deletions aal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ version = "0.1.0"
edition = "2024"

[features]
default = ["multicast"]
multicast = []

[dependencies]
Expand Down
1 change: 1 addition & 0 deletions asic/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ version = "0.1.0"
edition = "2024"

[features]
default = ["multicast"]
tofino_asic = [
"dep:lazy_static",
"dep:transceiver-controller",
Expand Down
1 change: 1 addition & 0 deletions dpd-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ edition = "2024"
description = "Client library for the Dendrite data plane daemon"

[features]
default = ["multicast"]
multicast = ["asic/multicast"]
chaos = ["asic/chaos"]
tofino_asic = ["asic/tofino_asic"]
Expand Down
1 change: 1 addition & 0 deletions dpd/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ authors = ["nils <nils@oxide.computer>"]
edition = "2024"

[features]
default = ["multicast"]
multicast = ["aal/multicast", "asic/multicast"]
tofino_asic = ["asic/tofino_asic"]
tofino_stub = ["asic/tofino_stub"]
Expand Down
11 changes: 6 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 @@ -2393,15 +2393,16 @@ 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)
);
let expected = vec![
IpSrc::Exact(IpAddr::V4(Ipv4Addr::new(10, 0, 0, 1))),
IpSrc::Exact(IpAddr::V4(Ipv4Addr::new(192, 168, 1, 1))),
];
assert_eq!(canonicalize_sources(Some(exact_sources)), Some(expected));

// Single Exact source stays as-is
let single_exact = vec![IpSrc::Exact(IpAddr::V6(Ipv6Addr::new(
Expand Down
1 change: 1 addition & 0 deletions swadm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ authors = ["nils <nils@oxide.computer>"]
edition = "2024"

[features]
default = ["multicast"]
multicast = []

[dependencies]
Expand Down