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 667F19746F for ; Tue, 5 Mar 2024 10:27:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 43B253DFD for ; Tue, 5 Mar 2024 10:27:44 +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 ; Tue, 5 Mar 2024 10:27:43 +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 9D28D487CF for ; Tue, 5 Mar 2024 10:27:43 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Tue, 5 Mar 2024 10:26:30 +0100 Message-Id: <20240305092703.126906-4-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240305092703.126906-1-c.ebner@proxmox.com> References: <20240305092703.126906-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.045 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mod.rs] Subject: [pbs-devel] [RFC v2 pxar 03/36] format/decoder: add method to read payload references 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: Tue, 05 Mar 2024 09:27:44 -0000 Adds a dedicated type and decoder method to read payload references. This is in preparation for reading payloads from a dedicated payload input stream. Signed-off-by: Christian Ebner --- changes since version 1: - not present in previous version src/decoder/mod.rs | 14 ++++++++++++++ src/format/mod.rs | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/src/decoder/mod.rs b/src/decoder/mod.rs index d1fb911..70c44ce 100644 --- a/src/decoder/mod.rs +++ b/src/decoder/mod.rs @@ -661,6 +661,20 @@ impl DecoderImpl { async fn read_quota_project_id(&mut self) -> io::Result { self.read_simple_entry("quota project id").await } + + async fn read_payload_ref(&mut self) -> io::Result { + let content_size = + usize::try_from(self.current_header.content_size()).map_err(io_err_other)?; + + if content_size != 2 * size_of::() { + io_bail!("bad payload reference entry"); + } + + let offset: u64 = seq_read_entry(&mut self.input).await?; + let size: u64 = seq_read_entry(&mut self.input).await?; + + Ok(format::PayloadRef { offset, size }) + } } /// Reader for file contents inside a pxar archive. diff --git a/src/format/mod.rs b/src/format/mod.rs index 3512691..a3a7245 100644 --- a/src/format/mod.rs +++ b/src/format/mod.rs @@ -725,6 +725,12 @@ impl GoodbyeItem { } } +#[derive(Clone, Debug)] +pub(crate) struct PayloadRef { + pub(crate) offset: u64, + pub(crate) size: u64, +} + /// Hash a file name for use in the goodbye table. pub fn hash_filename(name: &[u8]) -> u64 { use std::hash::Hasher; -- 2.39.2