From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@proxmox.com>
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 4482077F74
for <pbs-devel@lists.proxmox.com>; Wed, 21 Jul 2021 17:11:16 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 30614172E1
for <pbs-devel@lists.proxmox.com>; Wed, 21 Jul 2021 17:10:46 +0200 (CEST)
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 id 93FF3172BE
for <pbs-devel@lists.proxmox.com>; Wed, 21 Jul 2021 17:10:44 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 6D22040D62
for <pbs-devel@lists.proxmox.com>; Wed, 21 Jul 2021 17:10:44 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Wed, 21 Jul 2021 17:10:41 +0200
Message-Id: <20210721151043.2906767-4-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20210721151043.2906767-1-d.csapak@proxmox.com>
References: <20210721151043.2906767-1-d.csapak@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.540 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
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: [pbs-devel] [PATCH proxmox-backup v2 4/6] tape: changer: sg_pt:
extend volume tag parsing
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 21 Jul 2021 15:11:16 -0000
by also returning the size we read from the reader (we need that later)
and while were at it, also return the alternate volume tag if we have
it (we already read it, so we can return it)
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
new in v2
src/tape/changer/sg_pt_changer.rs | 32 +++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/tape/changer/sg_pt_changer.rs b/src/tape/changer/sg_pt_changer.rs
index a15d8192..9938dfe1 100644
--- a/src/tape/changer/sg_pt_changer.rs
+++ b/src/tape/changer/sg_pt_changer.rs
@@ -507,30 +507,34 @@ impl SubHeader {
&self,
reader: &mut R,
full: bool,
- ) -> Result<Option<String>, Error> {
+ ) -> Result<(Option<String>, usize), Error> {
if (self.flags & 128) != 0 { // has PVolTag
let tmp = reader.read_exact_allocated(SCSI_VOLUME_TAG_LEN)?;
if full {
let volume_tag = scsi_ascii_to_string(&tmp);
- return Ok(Some(volume_tag));
+ return Ok((Some(volume_tag), SCSI_VOLUME_TAG_LEN));
+ } else {
+ return Ok((None, SCSI_VOLUME_TAG_LEN));
}
}
- Ok(None)
+ Ok((None, 0))
}
// AFAIK, tape changer do not use AlternateVolumeTag
// but parse anyways, just to be sure
- fn skip_alternate_volume_tag<R: Read>(
+ fn parse_alternate_volume_tag<R: Read>(
&self,
reader: &mut R,
- ) -> Result<Option<String>, Error> {
+ ) -> Result<(Option<String>, usize), Error> {
if (self.flags & 64) != 0 { // has AVolTag
- let _tmp = reader.read_exact_allocated(SCSI_VOLUME_TAG_LEN)?;
+ let tmp = reader.read_exact_allocated(SCSI_VOLUME_TAG_LEN)?;
+ let avoltag = scsi_ascii_to_string(&tmp);
+ Ok((Some(avoltag), SCSI_VOLUME_TAG_LEN))
+ } else {
+ Ok((None, 0))
}
-
- Ok(None)
}
}
@@ -668,9 +672,9 @@ fn decode_element_status_page(
let desc: TransportDescriptor = unsafe { reader.read_be_value()? };
let full = (desc.flags1 & 1) != 0;
- let volume_tag = subhead.parse_optional_volume_tag(&mut reader, full)?;
+ let (volume_tag, _) = subhead.parse_optional_volume_tag(&mut reader, full)?;
- subhead.skip_alternate_volume_tag(&mut reader)?;
+ subhead.parse_alternate_volume_tag(&mut reader)?;
let mut reserved = [0u8; 4];
reader.read_exact(&mut reserved)?;
@@ -687,9 +691,9 @@ fn decode_element_status_page(
let desc: StorageDescriptor = unsafe { reader.read_be_value()? };
let full = (desc.flags1 & 1) != 0;
- let volume_tag = subhead.parse_optional_volume_tag(&mut reader, full)?;
+ let (volume_tag, _) = subhead.parse_optional_volume_tag(&mut reader, full)?;
- subhead.skip_alternate_volume_tag(&mut reader)?;
+ subhead.parse_alternate_volume_tag(&mut reader)?;
let mut reserved = [0u8; 4];
reader.read_exact(&mut reserved)?;
@@ -722,9 +726,9 @@ fn decode_element_status_page(
};
let full = (desc.flags1 & 1) != 0;
- let volume_tag = subhead.parse_optional_volume_tag(&mut reader, full)?;
+ let (volume_tag, _) = subhead.parse_optional_volume_tag(&mut reader, full)?;
- subhead.skip_alternate_volume_tag(&mut reader)?;
+ subhead.parse_alternate_volume_tag(&mut reader)?;
let dvcid: DvcidHead = unsafe { reader.read_be_value()? };
--
2.30.2