diff --git a/src/config/network.rs b/src/config/network.rs index 1048550d..380e5201 100644 --- a/src/config/network.rs +++ b/src/config/network.rs @@ -20,7 +20,7 @@ pub use parser::*; #[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize)] #[serde(rename_all = "lowercase")] /// Interface configuration method -pub enum ConfigMethod { +pub enum NetworkConfigMethod { /// Configuration is done manually using other tools Manual, /// Define interfaces with statically allocated addresses. @@ -39,11 +39,11 @@ pub enum ConfigMethod { max_length: libc::IFNAMSIZ-1, }, method_v4: { - type: ConfigMethod, + type: NetworkConfigMethod, optional: true, }, method_v6: { - type: ConfigMethod, + type: NetworkConfigMethod, optional: true, }, options_v4: { @@ -76,9 +76,9 @@ pub struct Interface { /// Interface name pub name: String, #[serde(skip_serializing_if="Option::is_none")] - pub method_v4: Option, + pub method_v4: Option, #[serde(skip_serializing_if="Option::is_none")] - pub method_v6: Option, + pub method_v6: Option, #[serde(skip_serializing_if="Option::is_none")] /// IPv4 address pub address_v4: Option, @@ -124,7 +124,7 @@ impl Interface { } } - fn set_method_v4(&mut self, method: ConfigMethod) -> Result<(), Error> { + fn set_method_v4(&mut self, method: NetworkConfigMethod) -> Result<(), Error> { if self.method_v4.is_none() { self.method_v4 = Some(method); } else { @@ -133,7 +133,7 @@ impl Interface { Ok(()) } - fn set_method_v6(&mut self, method: ConfigMethod) -> Result<(), Error> { + fn set_method_v6(&mut self, method: NetworkConfigMethod) -> Result<(), Error> { if self.method_v6.is_none() { self.method_v6 = Some(method); } else { @@ -250,12 +250,12 @@ impl Interface { fn write_iface(&self, w: &mut dyn Write) -> Result<(), Error> { - fn method_to_str(method: ConfigMethod) -> &'static str { + fn method_to_str(method: NetworkConfigMethod) -> &'static str { match method { - ConfigMethod::Static => "static", - ConfigMethod::Loopback => "loopback", - ConfigMethod::Manual => "manual", - ConfigMethod::DHCP => "dhcp", + NetworkConfigMethod::Static => "static", + NetworkConfigMethod::Loopback => "loopback", + NetworkConfigMethod::Manual => "manual", + NetworkConfigMethod::DHCP => "dhcp", } } @@ -264,7 +264,7 @@ impl Interface { } if self.method_v4 == self.method_v6 { - let method = self.method_v4.unwrap_or(ConfigMethod::Static); + let method = self.method_v4.unwrap_or(NetworkConfigMethod::Static); writeln!(w, "iface {} {}", self.name, method_to_str(method))?; self.write_iface_attributes_v4(w)?; self.write_iface_attributes_v6(w)?; diff --git a/src/config/network/parser.rs b/src/config/network/parser.rs index a2858372..232385f9 100644 --- a/src/config/network/parser.rs +++ b/src/config/network/parser.rs @@ -11,7 +11,7 @@ use proxmox::*; // for IP macros use super::helper::*; use super::lexer::*; -use super::{NetworkConfig, NetworkOrderEntry, Interface, ConfigMethod}; +use super::{NetworkConfig, NetworkOrderEntry, Interface, NetworkConfigMethod}; pub struct NetworkParser { input: Peekable>, @@ -222,16 +222,16 @@ impl NetworkParser { Token::Newline => break, Token::Inet => address_family_v4 = true, Token::Inet6 => address_family_v6 = true, - Token::Loopback => config_method = Some(ConfigMethod::Loopback), - Token::Static => config_method = Some(ConfigMethod::Static), - Token::Manual => config_method = Some(ConfigMethod::Manual), - Token::DHCP => config_method = Some(ConfigMethod::DHCP), + Token::Loopback => config_method = Some(NetworkConfigMethod::Loopback), + Token::Static => config_method = Some(NetworkConfigMethod::Static), + Token::Manual => config_method = Some(NetworkConfigMethod::Manual), + Token::DHCP => config_method = Some(NetworkConfigMethod::DHCP), _ => bail!("unknown iface option {}", text), } } let has_attributes = self.peek()? == Token::Attribute; - let config_method = config_method.unwrap_or(ConfigMethod::Static); + let config_method = config_method.unwrap_or(NetworkConfigMethod::Static); if !(address_family_v4 || address_family_v6) { address_family_v4 = true; @@ -328,7 +328,7 @@ impl NetworkParser { interface.active = *active; } else if exists { // also add all physical NICs let mut interface = Interface::new(iface.clone()); - interface.set_method_v4(ConfigMethod::Manual)?; + interface.set_method_v4(NetworkConfigMethod::Manual)?; interface.exists = true; interface.active = *active; config.interfaces.insert(interface.name.clone(), interface);