From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id F1A1EC1C6B for ; Thu, 18 Jan 2024 16:45:24 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 69FD7180BF for ; Thu, 18 Jan 2024 16:45:24 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 18 Jan 2024 16:45:23 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 533F049212 for ; Thu, 18 Jan 2024 16:45:23 +0100 (CET) From: Stefan Lendl To: pbs-devel@lists.proxmox.com Date: Thu, 18 Jan 2024 16:44:20 +0100 Message-ID: <20240118154424.794624-6-s.lendl@proxmox.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240118154424.794624-1-s.lendl@proxmox.com> References: <20240118154424.794624-1-s.lendl@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.033 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup v2 5/9] config: remove unnecessary pub in various methods in NetworkConfig X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jan 2024 15:45:25 -0000 Signed-off-by: Stefan Lendl Tested-by: Lukas Wagner Reviewd-by: Lukas Wagner --- pbs-config/src/network/mod.rs | 10 +++++----- pbs-config/src/network/parser.rs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pbs-config/src/network/mod.rs b/pbs-config/src/network/mod.rs index 02117535..51b09937 100644 --- a/pbs-config/src/network/mod.rs +++ b/pbs-config/src/network/mod.rs @@ -251,7 +251,7 @@ impl NetworkConfig { } /// Check if ports are used only once - pub fn check_port_usage(&self) -> Result<(), Error> { + fn check_port_usage(&self) -> Result<(), Error> { let mut used_ports = HashMap::new(); let mut check_port_usage = |iface, ports: &Vec| { for port in ports.iter() { @@ -280,7 +280,7 @@ impl NetworkConfig { } /// Check if child mtu is less or equal than parent mtu - pub fn check_mtu(&self, parent_name: &str, child_name: &str) -> Result<(), Error> { + fn check_mtu(&self, parent_name: &str, child_name: &str) -> Result<(), Error> { let parent = self .interfaces .get(parent_name) @@ -320,7 +320,7 @@ impl NetworkConfig { } /// Check if bond slaves exists - pub fn check_bond_slaves(&self) -> Result<(), Error> { + fn check_bond_slaves(&self) -> Result<(), Error> { for (iface, interface) in self.interfaces.iter() { if let Some(slaves) = &interface.slaves { for slave in slaves.iter() { @@ -348,7 +348,7 @@ impl NetworkConfig { } /// Check if bridge ports exists - pub fn check_bridge_ports(&self) -> Result<(), Error> { + fn check_bridge_ports(&self) -> Result<(), Error> { lazy_static! { static ref VLAN_INTERFACE_REGEX: Regex = Regex::new(r"^(\S+)\.(\d+)$").unwrap(); } @@ -372,7 +372,7 @@ impl NetworkConfig { Ok(()) } - pub fn write_config(&self, w: &mut dyn Write) -> Result<(), Error> { + fn write_config(&self, w: &mut dyn Write) -> Result<(), Error> { self.check_port_usage()?; self.check_bond_slaves()?; self.check_bridge_ports()?; diff --git a/pbs-config/src/network/parser.rs b/pbs-config/src/network/parser.rs index 5a83e192..c6992bd3 100644 --- a/pbs-config/src/network/parser.rs +++ b/pbs-config/src/network/parser.rs @@ -487,11 +487,11 @@ impl NetworkParser { &mut self, existing_interfaces: Option<&HashMap>, ) -> Result { - self._parse_interfaces(existing_interfaces) + self.do_parse_interfaces(existing_interfaces) .map_err(|err| format_err!("line {}: {}", self.line_nr, err)) } - pub fn _parse_interfaces( + fn do_parse_interfaces( &mut self, existing_interfaces: Option<&HashMap>, ) -> Result { -- 2.42.0