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 DC6DEBC067 for ; Thu, 28 Mar 2024 13:38:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BCD159D12 for ; Thu, 28 Mar 2024 13:37:35 +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, 28 Mar 2024 13:37:35 +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 E123F428ED for ; Thu, 28 Mar 2024 13:37:34 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 28 Mar 2024 13:36:13 +0100 Message-Id: <20240328123707.336951-5-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240328123707.336951-1-c.ebner@proxmox.com> References: <20240328123707.336951-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.031 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 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] [PATCH v3 pxar 04/58] decoder: factor out skip part from skip_entry 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, 28 Mar 2024 12:38:05 -0000 Make the skip part reusable for a different input. In preparation for skipping payload paddings in a separated input. Signed-off-by: Christian Ebner --- changes since version 2: - not present in previous version src/decoder/mod.rs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/decoder/mod.rs b/src/decoder/mod.rs index cc50e4f..f439327 100644 --- a/src/decoder/mod.rs +++ b/src/decoder/mod.rs @@ -563,15 +563,19 @@ impl DecoderImpl { // async fn skip_entry(&mut self, offset: u64) -> io::Result<()> { - let mut len = self.current_header.content_size() - offset; + let len = (self.current_header.content_size() - offset) as usize; + Self::skip(&mut self.input, len).await + } + + async fn skip(input: &mut I, len: usize) -> io::Result<()> { + let mut len = len; let scratch = scratch_buffer(); - while len >= (scratch.len() as u64) { - seq_read_exact(&mut self.input, scratch).await?; - len -= scratch.len() as u64; + while len >= (scratch.len()) { + seq_read_exact(input, scratch).await?; + len -= scratch.len(); } - let len = len as usize; if len > 0 { - seq_read_exact(&mut self.input, &mut scratch[..len]).await?; + seq_read_exact(input, &mut scratch[..len]).await?; } Ok(()) } -- 2.39.2