aaru-dps/aaruremote
1
0
Fork 0
mirror of https://github.com/aaru-dps/aaruremote.git synced 2025-12-16 19:24:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10 from kkaisershot/master

Browse Source
This commit is contained in:
Natalia Portillo
2021-07-26 08:04:39 +01:00
committed by GitHub
parent 9778904dba 27b7e3ddb0
commit 29aa181be2
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
linux/device.c
View File

@@ -242,7 +242,26 @@ int32_t GetDeviceType(void* device_ctx)
} }
ret = 0; ret = 0;
chrptr = strchr(dev_path, ':') - 1; chrptr = strchr(dev_path, ':');
if(!chrptr)
{
chrptr = strrchr(dev_path, '.');
if(!chrptr)
{
free((void*)sysfs_path);
free((void*)dev_path);
free((void*)host_no);
free((void*)iscsi_path);
free((void*)scsi_path);
free((void*)spi_path);
free((void*)fc_path);
free((void*)sas_path);
return dev_type;
}
}
chrptr--;
while(chrptr != dev_path) while(chrptr != dev_path)
{ {

4
worker.c
View File

@@ -516,9 +516,9 @@ void* WorkingLoop(void* arguments)
pkt_res_scsi = (AaruPacketResScsi*)out_buf; pkt_res_scsi = (AaruPacketResScsi*)out_buf;
if(sense_buf) memcpy(out_buf + sizeof(AaruPacketResScsi), sense_buf, sense_len); if(sense_buf) memcpy(out_buf + sizeof(AaruPacketResScsi), sense_buf, sense_len);
if(buffer) memcpy(out_buf + sizeof(AaruPacketResScsi) + sense_len, buffer, pkt_cmd_scsi->buf_len); if(buffer) memcpy(out_buf + sizeof(AaruPacketResScsi) + sense_len, buffer, le32toh(pkt_cmd_scsi->buf_len));
pkt_res_scsi->hdr.len = htole32(sizeof(AaruPacketResScsi) + sense_len + pkt_cmd_scsi->buf_len); pkt_res_scsi->hdr.len = htole32(sizeof(AaruPacketResScsi) + sense_len + le32toh(pkt_cmd_scsi->buf_len));
pkt_res_scsi->hdr.packet_type = AARUREMOTE_PACKET_TYPE_RESPONSE_SCSI; pkt_res_scsi->hdr.packet_type = AARUREMOTE_PACKET_TYPE_RESPONSE_SCSI;
pkt_res_scsi->hdr.version = AARUREMOTE_PACKET_VERSION; pkt_res_scsi->hdr.version = AARUREMOTE_PACKET_VERSION;
pkt_res_scsi->hdr.remote_id = htole32(AARUREMOTE_REMOTE_ID); pkt_res_scsi->hdr.remote_id = htole32(AARUREMOTE_REMOTE_ID);