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 EE20C1FF1A6 for ; Fri, 5 Dec 2025 12:25:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0033F155D8; Fri, 5 Dec 2025 12:26:27 +0100 (CET) From: Christoph Heiss To: pdm-devel@lists.proxmox.com Date: Fri, 5 Dec 2025 12:25:06 +0100 Message-ID: <20251205112528.373387-5-c.heiss@proxmox.com> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251205112528.373387-1-c.heiss@proxmox.com> References: <20251205112528.373387-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1764933907369 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.050 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 Subject: [pdm-devel] [PATCH proxmox v2 04/14] network-types: add api wrapper type for std::net::IpAddr X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" Much like the existing ones for Ipv4Addr/Ipv6Addr. Signed-off-by: Christoph Heiss --- Changes v1 -> v2: * no changes proxmox-network-types/src/ip_address.rs | 64 ++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/proxmox-network-types/src/ip_address.rs b/proxmox-network-types/src/ip_address.rs index 1c721975..5133f5d9 100644 --- a/proxmox-network-types/src/ip_address.rs +++ b/proxmox-network-types/src/ip_address.rs @@ -16,8 +16,10 @@ 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 proxmox_schema::{ + api_types::{IP_SCHEMA, IP_V4_SCHEMA, IP_V6_SCHEMA}, + ApiType, UpdaterType, + }; use serde_with::{DeserializeFromStr, SerializeDisplay}; #[derive( @@ -135,6 +137,64 @@ pub mod api_types { Self(value) } } + + #[derive( + Debug, + Clone, + Copy, + Eq, + PartialEq, + Ord, + PartialOrd, + DeserializeFromStr, + SerializeDisplay, + Hash, + )] + #[repr(transparent)] + pub struct IpAddr(pub std::net::IpAddr); + + impl ApiType for IpAddr { + const API_SCHEMA: proxmox_schema::Schema = IP_SCHEMA; + } + + impl UpdaterType for IpAddr { + type Updater = Option; + } + + impl Deref for IpAddr { + type Target = std::net::IpAddr; + + fn deref(&self) -> &Self::Target { + &self.0 + } + } + + impl DerefMut for IpAddr { + fn deref_mut(&mut self) -> &mut Self::Target { + &mut self.0 + } + } + + impl std::str::FromStr for IpAddr { + type Err = AddrParseError; + + fn from_str(value: &str) -> Result { + let ip_address = std::net::IpAddr::from_str(value)?; + Ok(Self(ip_address)) + } + } + + impl std::fmt::Display for IpAddr { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + self.0.fmt(f) + } + } + + impl From for IpAddr { + fn from(value: std::net::IpAddr) -> Self { + Self(value) + } + } } /// The family (v4 or v6) of an IP address or CIDR prefix -- 2.51.2 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel