tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/config/network.rs - check_bridge_ports: correctly check vlan ports

Browse Source
This commit is contained in:
Dietmar Maurer
2020-05-08 15:51:47 +02:00
parent 0f6bdbb01f
commit 5bef0f43da
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/config/network.rs
View File

@ -3,6 +3,8 @@ use std::collections::{HashSet, HashMap, BTreeMap};
use anyhow::{Error, format_err, bail}; use anyhow::{Error, format_err, bail};
use serde::de::{value, IntoDeserializer, Deserialize}; use serde::de::{value, IntoDeserializer, Deserialize};
use lazy_static::lazy_static;
use regex::Regex;
use proxmox::tools::{fs::replace_file, fs::CreateOptions}; use proxmox::tools::{fs::replace_file, fs::CreateOptions};
@ -397,9 +399,15 @@ impl NetworkConfig {
/// Check if bridge ports exists /// Check if bridge ports exists
pub fn check_bridge_ports(&self) -> Result<(), Error> { pub fn check_bridge_ports(&self) -> Result<(), Error> {
lazy_static!{
static ref VLAN_INTERFACE_REGEX: Regex = Regex::new(r"^(\S+)\.(\d+)$").unwrap();
}
for (iface, interface) in self.interfaces.iter() { for (iface, interface) in self.interfaces.iter() {
if let Some(ports) = &interface.bridge_ports { if let Some(ports) = &interface.bridge_ports {
for port in ports.iter() { for port in ports.iter() {
let captures = VLAN_INTERFACE_REGEX.captures(port);
let port = if let Some(ref caps) = captures { &caps[1] } else { port.as_str() };
if !self.interfaces.contains_key(port) { if !self.interfaces.contains_key(port) {
bail!("bridge '{}' - unable to find port '{}'", iface, port); bail!("bridge '{}' - unable to find port '{}'", iface, port);
} }