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 77D1495CFC for ; Wed, 28 Feb 2024 15:03:22 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 60324CE53 for ; Wed, 28 Feb 2024 15:02:51 +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 ; Wed, 28 Feb 2024 15:02:47 +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 88745479F6 for ; Wed, 28 Feb 2024 15:02:47 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 28 Feb 2024 15:01:58 +0100 Message-Id: <20240228140226.1251979-9-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240228140226.1251979-1-c.ebner@proxmox.com> References: <20240228140226.1251979-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.049 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] [RFC pxar 08/36] encoder: add payload position capability 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: Wed, 28 Feb 2024 14:03:22 -0000 Allows to read the current payload offset from the dedicated payload input stream. This is required to get the current offset for calculation of forced boundaries in the proxmox-backup-client, when injecting reused payload chunks into the payload stream. Signed-off-by: Christian Ebner --- src/encoder/aio.rs | 5 +++++ src/encoder/mod.rs | 4 ++++ src/encoder/sync.rs | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/src/encoder/aio.rs b/src/encoder/aio.rs index 07ad275..12121fc 100644 --- a/src/encoder/aio.rs +++ b/src/encoder/aio.rs @@ -79,6 +79,11 @@ impl<'a, T: SeqWrite + 'a> Encoder<'a, T> { }) } + /// Get current position for payload stream + pub fn payload_position(&self) -> io::Result { + self.inner.payload_position() + } + // /// Convenience shortcut to add a *regular* file by path including its contents to the archive. // pub async fn add_file( // &mut self, diff --git a/src/encoder/mod.rs b/src/encoder/mod.rs index 5b196df..921a0d9 100644 --- a/src/encoder/mod.rs +++ b/src/encoder/mod.rs @@ -496,6 +496,10 @@ impl<'a, T: SeqWrite + 'a> EncoderImpl<'a, T> { Ok(offset) } + pub fn payload_position(&self) -> io::Result { + Ok(PayloadOffset(self.state()?.payload_position())) + } + /// Encode a payload reference, returning the payload offset within the payload stream pub async fn add_payload_ref( &mut self, diff --git a/src/encoder/sync.rs b/src/encoder/sync.rs index ac78ae3..818279f 100644 --- a/src/encoder/sync.rs +++ b/src/encoder/sync.rs @@ -100,6 +100,11 @@ impl<'a, T: SeqWrite + 'a> Encoder<'a, T> { )) } + /// Get current payload position for payload stream + pub fn payload_position(&self) -> io::Result { + self.inner.payload_position() + } + /// Encode a payload reference, returning the payload offset within the payload stream pub async fn add_payload_ref( &mut self, -- 2.39.2