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

Negotiate ImmediateData during login and store the result in iscsi->

Browse Source 
We will use this later to decide when we should send unsolicited imemdiate
data to the target. Currently we always send unsolicited immediate data
but targets configured to not allow immediate data may refuce this and
turn an error.
This commit is contained in:
Ronnie Sahlberg
2011-01-02 12:59:41 +11:00
parent 32228a4509
commit 1f1e5111d4
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/iscsi-private.h
View File

@@ -45,6 +45,11 @@ enum iscsi_initial_r2t {
ISCSI_INITIAL_R2T_YES = 1
};
enum iscsi_immediate_data {
ISCSI_IMMEDIATE_DATA_NO = 0,
ISCSI_IMMEDIATE_DATA_YES = 1
};
struct iscsi_context {
const char *initiator_name;
const char *target_name;
@@ -93,6 +98,8 @@ struct iscsi_context {
uint32_t max_recv_data_segment_length;
enum iscsi_initial_r2t want_initial_r2t;
enum iscsi_initial_r2t use_initial_r2t;
enum iscsi_initial_r2t want_immediate_data;
enum iscsi_initial_r2t use_immediate_data;
};
#define ISCSI_PDU_IMMEDIATE 0x40

2
lib/init.c
View File

@@ -65,6 +65,8 @@ iscsi_create_context(const char *initiator_name)
iscsi->max_recv_data_segment_length = 262144;
iscsi->want_initial_r2t = ISCSI_INITIAL_R2T_NO;
iscsi->use_initial_r2t = ISCSI_INITIAL_R2T_NO;
iscsi->want_immediate_data = ISCSI_IMMEDIATE_DATA_YES;
iscsi->use_immediate_data = ISCSI_IMMEDIATE_DATA_YES;
return iscsi;
}

13
lib/login.c
View File

@@ -218,12 +218,15 @@ iscsi_login_add_immediatedata(struct iscsi_context *iscsi, struct iscsi_pdu *pdu
return 0;
}
str = (char *)"ImmediateData=Yes";
asprintf(&str, "ImmediateData=%s", iscsi->want_immediate_data == ISCSI_IMMEDIATE_DATA_NO ?
"No" : "Yes");
if (iscsi_pdu_add_data(iscsi, pdu, (unsigned char *)str, strlen(str)+1)
!= 0) {
iscsi_set_error(iscsi, "Out-of-memory: pdu add data failed.");
free(str);
return -1;
}
free(str);
return 0;
}
@@ -942,6 +945,14 @@ iscsi_process_login_reply(struct iscsi_context *iscsi, struct iscsi_pdu *pdu,
}
}
if (!strncmp((char *)ptr, "ImmediateData=", 14)) {
if (!strcmp((char *)ptr + 14, "No")) {
iscsi->use_immediate_data = ISCSI_IMMEDIATE_DATA_NO;
} else {
iscsi->use_immediate_data = ISCSI_IMMEDIATE_DATA_YES;
}
}
if (!strncmp((char *)ptr, "MaxBurstLength=", 15)) {
iscsi->max_burst_length = strtol((char *)ptr + 15, NULL, 10);
}