Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -107,18 +107,21 @@ pub fn process_activate_multicastgroup(
"Invalid ResourceExtension PDA for MulticastGroupBlock"
);

// Allocate from ResourceExtension bitmap
let mut buffer = resource_ext.data.borrow_mut();
let mut resource = ResourceExtensionBorrowed::inplace_from(&mut buffer[..])?;

let allocated = resource.allocate(1)?;

match allocated {
IdOrIp::Ip(network) => {
multicastgroup.multicast_ip = network.ip();
}
IdOrIp::Id(_) => {
return Err(DoubleZeroError::InvalidArgument.into());
// Allocate from ResourceExtension bitmap (only if not already allocated)
// This check handles potential re-activation scenarios where resources may already be assigned
if multicastgroup.multicast_ip == std::net::Ipv4Addr::UNSPECIFIED {
let mut buffer = resource_ext.data.borrow_mut();
let mut resource = ResourceExtensionBorrowed::inplace_from(&mut buffer[..])?;

let allocated = resource.allocate(1)?;

match allocated {
IdOrIp::Ip(network) => {
multicastgroup.multicast_ip = network.ip();
}
IdOrIp::Id(_) => {
return Err(DoubleZeroError::InvalidArgument.into());
}
}
}
} else {
Expand Down
Loading