admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #58 from plieven/upstream_fixes

Browse Source 
Upstream fixes
This commit is contained in:
Ronnie Sahlberg
2013-01-28 17:34:20 -08:00
parent aefa88b724 8bc0046f51
commit c1722f5fac
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/iscsi.h
View File

@@ -573,7 +573,7 @@ iscsi_task_mgmt_target_cold_reset_async(struct iscsi_context *iscsi,
*/ */
struct iscsi_data { struct iscsi_data {
int size; size_t size;
unsigned char *data; unsigned char *data;
}; };

4
lib/connect.c
View File

@@ -340,6 +340,10 @@ try_again:
iscsi_free_iscsi_inqueue(old_iscsi, old_iscsi->inqueue); iscsi_free_iscsi_inqueue(old_iscsi, old_iscsi->inqueue);
} }
if (old_iscsi->outqueue_current != NULL && old_iscsi->outqueue_current->flags & ISCSI_PDU_DELETE_WHEN_SENT) {
iscsi_free_pdu(old_iscsi, old_iscsi->outqueue_current);
}
close(iscsi->fd); close(iscsi->fd);
iscsi->fd = old_iscsi->fd; iscsi->fd = old_iscsi->fd;
iscsi->mallocs+=old_iscsi->mallocs; iscsi->mallocs+=old_iscsi->mallocs;

4
lib/socket.c
View File

@@ -753,8 +753,8 @@ iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu)
unsigned long crc; unsigned long crc;
if (pdu->outdata.size < ISCSI_RAW_HEADER_SIZE + 4) { if (pdu->outdata.size < ISCSI_RAW_HEADER_SIZE + 4) {
iscsi_set_error(iscsi, "PDU too small (%d) to contain header digest", iscsi_set_error(iscsi, "PDU too small (%u) to contain header digest",
pdu->outdata.size); (unsigned int) pdu->outdata.size);
return -1; return -1;
} }