Skip to content

Fix: Allow DHCP traffic on unmanaged VLAN bridges #1307

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
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
14 changes: 14 additions & 0 deletions src/network/bridge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ impl<'a> Bridge<'a> {
}
}


impl driver::NetworkDriver for Bridge<'_> {
fn network_name(&self) -> String {
self.info.network.name.clone()
Expand Down Expand Up @@ -583,6 +584,19 @@ fn create_interfaces(
}

if let BridgeMode::Unmanaged = data.mode {
if let Some(vlan_id) = data.vlan {
log::info!(
"Configuring VLAN {} filtering rules for unmanaged bridge {}",
vlan_id,
data.bridge_interface_name
);


crate::utils::netlink::allow_dhcp_on_vlan(
&data.bridge_interface_name,
vlan_id,
)?;
}
return Err(err)
.wrap("in unmanaged mode, the bridge must already exist on the host");
}
Expand Down
55 changes: 55 additions & 0 deletions src/network/netlink.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use std::{
os::fd::{AsFd, AsRawFd, BorrowedFd},
};


use crate::{
error::{ErrorWrap, NetavarkError, NetavarkResult},
network::constants,
Expand Down Expand Up @@ -612,3 +613,57 @@ pub fn parse_create_link_options(msg: &mut LinkMessage, options: CreateLinkOptio
.push(LinkAttribute::NetNsFd(netns.as_raw_fd()));
}
}


use log::{info, warn};
use rtnetlink::{new_connection, Error};
use futures::stream::TryStreamExt;


pub fn allow_dhcp_on_vlan(bridge_name: &str, vlan_id: u16) -> Result<(), Error> {
info!(
"Applying DHCP allow rule on VLAN {} for bridge {}",
vlan_id, bridge_name
);

// Build VLAN subinterface name (e.g., br0.100)
let vlan_iface = format!("{}.{}", bridge_name, vlan_id);

// Create netlink connection
let (connection, handle, _) = new_connection()?;
tokio::spawn(connection);

// Lookup VLAN interface by name
let mut rt = tokio::runtime::Runtime::new().unwrap();
let mut links = rt.block_on(
Comment on lines +637 to +638
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (bug_risk): Using a new Tokio runtime inside an async context can lead to resource issues.

Instead of creating a new runtime, pass an existing handle or refactor to prevent nested runtimes and potential thread pool contention.

handle
.link()
.get()
.match_name(vlan_iface.clone())
.execute()
);

match rt.block_on(links.try_next()) {
Ok(Some(_link)) => {
info!(
"Found VLAN interface {}, would configure bridge VLAN filtering to allow DHCP (UDP 67/68)",
vlan_iface
);
// TODO: implement actual VLAN filtering adjustment here
Comment on lines +648 to +652
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: Missing implementation for VLAN filtering adjustment.

If this is meant to be a stub, clarify its status or return an error to indicate the feature is not yet implemented.

Suggested change
info!(
"Found VLAN interface {}, would configure bridge VLAN filtering to allow DHCP (UDP 67/68)",
vlan_iface
);
// TODO: implement actual VLAN filtering adjustment here
info!(
"Found VLAN interface {}, would configure bridge VLAN filtering to allow DHCP (UDP 67/68)",
vlan_iface
);
warn!(
"VLAN filtering adjustment for interface {} is not yet implemented.",
vlan_iface
);
return Err(anyhow::anyhow!(
"VLAN filtering adjustment for interface {} is not yet implemented.",
vlan_iface
));

}
Ok(None) => {
warn!(
"VLAN interface {} not found, skipping DHCP allow rule",
vlan_iface
);
}
Err(e) => {
warn!(
"Error looking up VLAN interface {}: {}",
vlan_iface, e
);
}
}

Ok(())
}