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

pdu: introduce ISCSI_PDU_CORK_WHEN_SENT

Browse Source 
Signed-off-by: Peter Lieven <pl@kamp.de>
This commit is contained in:
Peter Lieven
2014-06-13 13:07:39 +02:00
parent 5d55d32adb
commit 99585b6996
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/iscsi-private.h
View File

@@ -80,6 +80,7 @@ struct iscsi_context {
int fd; int fd;
int is_connected; int is_connected;
int is_corked;
int tcp_user_timeout; int tcp_user_timeout;
int tcp_keepcnt; int tcp_keepcnt;
@@ -209,6 +210,8 @@ struct iscsi_pdu {
* This includes any DATA-OUT PDU as well as all NOPs. * This includes any DATA-OUT PDU as well as all NOPs.
*/ */
#define ISCSI_PDU_DROP_ON_RECONNECT 0x00000004 #define ISCSI_PDU_DROP_ON_RECONNECT 0x00000004
/* stop sending after this PDU has been sent */
#define ISCSI_PDU_CORK_WHEN_SENT 0x00000008
uint32_t flags; uint32_t flags;

10
lib/socket.c
View File

@@ -611,6 +611,12 @@ iscsi_write_to_socket(struct iscsi_context *iscsi)
while (iscsi->outqueue != NULL || iscsi->outqueue_current != NULL) { while (iscsi->outqueue != NULL || iscsi->outqueue_current != NULL) {
if (iscsi->outqueue_current == NULL) { if (iscsi->outqueue_current == NULL) {
if (iscsi->is_corked) {
/* connection is corked we are not allowed to send
* additional PDUs */
return 0;
}
if (iscsi_serial32_compare(iscsi->outqueue->cmdsn, iscsi->maxcmdsn) > 0 if (iscsi_serial32_compare(iscsi->outqueue->cmdsn, iscsi->maxcmdsn) > 0
&& !(iscsi->outqueue->outdata.data[0] & ISCSI_PDU_IMMEDIATE)) { && !(iscsi->outqueue->outdata.data[0] & ISCSI_PDU_IMMEDIATE)) {
/* stop sending for non-immediate PDUs. maxcmdsn is reached */ /* stop sending for non-immediate PDUs. maxcmdsn is reached */
@@ -699,10 +705,12 @@ iscsi_write_to_socket(struct iscsi_context *iscsi)
if (pdu->payload_written != total) { if (pdu->payload_written != total) {
return 0; return 0;
} }
if (pdu->flags & ISCSI_PDU_DELETE_WHEN_SENT) { if (pdu->flags & ISCSI_PDU_DELETE_WHEN_SENT) {
iscsi_free_pdu(iscsi, pdu); iscsi_free_pdu(iscsi, pdu);
} }
if (pdu->flags & ISCSI_PDU_CORK_WHEN_SENT) {
iscsi->is_corked = 1;
}
iscsi->outqueue_current = NULL; iscsi->outqueue_current = NULL;
} }
return 0; return 0;