From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 043271FF165 for ; Thu, 22 May 2025 18:17:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 827D99CDE; Thu, 22 May 2025 18:17:35 +0200 (CEST) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Thu, 22 May 2025 18:16:19 +0200 Message-Id: <20250522161731.537011-4-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522161731.537011-1-s.hanreich@proxmox.com> References: <20250522161731.537011-1-s.hanreich@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.234 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH proxmox v3 3/4] network-types: add api types for ipv4/6 X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Add two types that transparently wrap the std structs for IPv4 and IPv6 addresses as well as MacAddress, so they can be used directly in structs with the API macro. Similar to their CIDR counterparts, they have a StringSchema and are (de-)serialized via the respective FromStr and Display implementations. Signed-off-by: Stefan Hanreich --- proxmox-network-types/src/ip_address.rs | 126 ++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/proxmox-network-types/src/ip_address.rs b/proxmox-network-types/src/ip_address.rs index 827141b9..8c21453a 100644 --- a/proxmox-network-types/src/ip_address.rs +++ b/proxmox-network-types/src/ip_address.rs @@ -11,6 +11,132 @@ use proxmox_schema::{ApiType, Schema, UpdaterType}; #[cfg(feature = "api-types")] use proxmox_schema::api_types::{CIDR_SCHEMA, CIDR_V4_SCHEMA, CIDR_V6_SCHEMA}; +#[cfg(feature = "api-types")] +pub mod api_types { + use std::net::AddrParseError; + use std::ops::{Deref, DerefMut}; + + use proxmox_schema::api_types::IP_V6_SCHEMA; + use proxmox_schema::{api_types::IP_V4_SCHEMA, ApiType, UpdaterType}; + use serde_with::{DeserializeFromStr, SerializeDisplay}; + + #[derive( + Debug, + Clone, + Copy, + Eq, + PartialEq, + Ord, + PartialOrd, + DeserializeFromStr, + SerializeDisplay, + Hash, + )] + #[repr(transparent)] + pub struct Ipv4Addr(std::net::Ipv4Addr); + + impl ApiType for Ipv4Addr { + const API_SCHEMA: proxmox_schema::Schema = IP_V4_SCHEMA; + } + + impl UpdaterType for Ipv4Addr { + type Updater = Option; + } + + impl Deref for Ipv4Addr { + type Target = std::net::Ipv4Addr; + + fn deref(&self) -> &Self::Target { + &self.0 + } + } + + impl DerefMut for Ipv4Addr { + fn deref_mut(&mut self) -> &mut Self::Target { + &mut self.0 + } + } + + impl std::str::FromStr for Ipv4Addr { + type Err = AddrParseError; + + fn from_str(value: &str) -> Result { + let ip_address = std::net::Ipv4Addr::from_str(value)?; + Ok(Self(ip_address)) + } + } + + impl std::fmt::Display for Ipv4Addr { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + self.0.fmt(f) + } + } + + impl From for Ipv4Addr { + fn from(value: std::net::Ipv4Addr) -> Self { + Self(value) + } + } + + #[derive( + Debug, + Clone, + Copy, + Eq, + PartialEq, + Ord, + PartialOrd, + DeserializeFromStr, + SerializeDisplay, + Hash, + )] + #[repr(transparent)] + pub struct Ipv6Addr(std::net::Ipv6Addr); + + impl ApiType for Ipv6Addr { + const API_SCHEMA: proxmox_schema::Schema = IP_V6_SCHEMA; + } + + impl UpdaterType for Ipv6Addr { + type Updater = Option; + } + + impl Deref for Ipv6Addr { + type Target = std::net::Ipv6Addr; + + fn deref(&self) -> &Self::Target { + &self.0 + } + } + + impl DerefMut for Ipv6Addr { + fn deref_mut(&mut self) -> &mut Self::Target { + &mut self.0 + } + } + + impl std::str::FromStr for Ipv6Addr { + type Err = AddrParseError; + + fn from_str(value: &str) -> Result { + let ip_address = std::net::Ipv6Addr::from_str(value)?; + Ok(Self(ip_address)) + } + } + + impl std::fmt::Display for Ipv6Addr { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + self.0.fmt(f) + } + } + + impl From for Ipv6Addr { + fn from(value: std::net::Ipv6Addr) -> Self { + Self(value) + } + } +} + /// The family (v4 or v6) of an IP address or CIDR prefix #[derive(Clone, Copy, Debug, Eq, PartialEq)] pub enum Family { -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel