summaryrefslogtreecommitdiffstats
path: root/src/net/tcp
diff options
context:
space:
mode:
authorMichael Brown2014-06-02 03:17:28 +0200
committerMichael Brown2014-06-03 03:04:46 +0200
commite047811c859bd11777c9a01d7ca89ca948567199 (patch)
treec84557d88a049527dfc80631dcc3d9cb3bed2380 /src/net/tcp
parent[ethernet] Provide eth_random_addr() to generate random Ethernet addresses (diff)
downloadipxe-e047811c859bd11777c9a01d7ca89ca948567199.tar.gz
ipxe-e047811c859bd11777c9a01d7ca89ca948567199.tar.xz
ipxe-e047811c859bd11777c9a01d7ca89ca948567199.zip
[scsi] Improve sense code parsing
Parse the sense data to extract the reponse code, the sense key, the additional sense code, and the additional sense code qualifier. Originally-implemented-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/net/tcp')
-rw-r--r--src/net/tcp/iscsi.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/net/tcp/iscsi.c b/src/net/tcp/iscsi.c
index a6fcd251..03c6d0f2 100644
--- a/src/net/tcp/iscsi.c
+++ b/src/net/tcp/iscsi.c
@@ -412,11 +412,12 @@ static int iscsi_rx_scsi_response ( struct iscsi_session *iscsi,
= &iscsi->rx_bhs.scsi_response;
struct scsi_rsp rsp;
uint32_t residual_count;
+ size_t data_len;
int rc;
/* Buffer up the PDU data */
if ( ( rc = iscsi_rx_buffered_data ( iscsi, data, len ) ) != 0 ) {
- DBGC ( iscsi, "iSCSI %p could not buffer login response: %s\n",
+ DBGC ( iscsi, "iSCSI %p could not buffer SCSI response: %s\n",
iscsi, strerror ( rc ) );
return rc;
}
@@ -432,9 +433,11 @@ static int iscsi_rx_scsi_response ( struct iscsi_session *iscsi,
} else if ( response->flags & ISCSI_DATA_FLAG_UNDERFLOW ) {
rsp.overrun = -(residual_count);
}
- if ( ISCSI_DATA_LEN ( response->lengths ) )
- memcpy ( &rsp.sense, ( iscsi->rx_buffer + 2 ),
- sizeof ( rsp.sense ) );
+ data_len = ISCSI_DATA_LEN ( response->lengths );
+ if ( data_len ) {
+ scsi_parse_sense ( ( iscsi->rx_buffer + 2 ), ( data_len - 2 ),
+ &rsp.sense );
+ }
iscsi_rx_buffered_data_done ( iscsi );
/* Check for errors */