iSCSI Code refactoring and simplification. Finally, removed obselete iSCSI PDU and session fields.

2 files changed, 197 insertions, 184 deletions

diff --git a/src/server/iscsi.c b/src/server/iscsi.c
index 306203d..8f51162 100644
--- a/src/server/iscsi.c
+++ b/src/server/iscsi.c
@@ -54,43 +54,43 @@ iscsi_globals *iscsi_globvec = NULL;
 
 /// iSCSI connection negotation key and value pair lookup table.
 static const iscsi_key_value_pair_lut_entry iscsi_connection_key_value_pair_lut[] = {
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_HEADER_DIGEST, (uint8_t *) "None", (uint8_t *) "CRC32C\0None\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_LIST, 0L },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_DIGEST, (uint8_t *) "None", (uint8_t *) "CRC32C\0None\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_LIST, 0L },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_RECV_DS_LEN, (uint8_t *) "8192", (uint8_t *) "512\016777215\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_DECLARATIVE, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_MULTI_NEGOTIATION | ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_OVERRIDE_DEFAULT },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_OF_MARKER, (uint8_t *) "No", (uint8_t *) "Yes\0No\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_BOOL_AND, 0L },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_IF_MARKER, (uint8_t *) "No", (uint8_t *) "Yes\0No\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_BOOL_AND, 0L },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_OF_MARK_INT, (uint8_t *) "1", (uint8_t *) "1\0""65535\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_MIN, 0L },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_IF_MARK_INT, (uint8_t *) "1", (uint8_t *) "1\0""65535\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_MIN, 0L },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD, (uint8_t *) "None", (uint8_t *) "CHAP\0None\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_LIST, 0L },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_A, (uint8_t *) "5", (uint8_t *) "5\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_LIST, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_CHAP_TYPE },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_N, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_CHAP_TYPE },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_R, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_CHAP_TYPE },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_I, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_CHAP_TYPE },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_C, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_CHAP_TYPE },
+	{ ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_HEADER_DIGEST, (uint8_t *) "None", (uint8_t *) "CRC32C\0None\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_LIST, 0L },
+	{ ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_DIGEST, (uint8_t *) "None", (uint8_t *) "CRC32C\0None\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_LIST, 0L },
+	{ ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_RECV_DS_LEN, (uint8_t *) "8192", (uint8_t *) "512\016777215\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_DECLARATIVE, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_MULTI_NEGOTIATION | ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_OVERRIDE_DEFAULT },
+	{ ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_OF_MARKER, (uint8_t *) "No", (uint8_t *) "Yes\0No\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_BOOL_AND, 0L },
+	{ ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_IF_MARKER, (uint8_t *) "No", (uint8_t *) "Yes\0No\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_BOOL_AND, 0L },
+	{ ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_OF_MARK_INT, (uint8_t *) "1", (uint8_t *) "1\0""65535\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_MIN, 0L },
+	{ ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_IF_MARK_INT, (uint8_t *) "1", (uint8_t *) "1\0""65535\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_MIN, 0L },
+	{ ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD, (uint8_t *) "None", (uint8_t *) "CHAP\0None\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_LIST, 0L },
+	{ ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_A, (uint8_t *) "5", (uint8_t *) "5\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_LIST, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_CHAP_TYPE },
+	{ ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_N, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_CHAP_TYPE },
+	{ ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_R, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_CHAP_TYPE },
+	{ ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_I, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_CHAP_TYPE },
+	{ ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_C, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_CHAP_TYPE },
 	{ NULL, NULL, NULL, ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_INVALID, 0L }
 };
 
 /// iSCSI session negotation key and value pair lookup table.
 static const iscsi_key_value_pair_lut_entry iscsi_session_key_value_pair_lut[] = {
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_CONNECTIONS, (uint8_t *) "1", (uint8_t *) "1\0""65535\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_MIN, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_DISCOVERY_IGNORE },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_SEND_TARGETS, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_SPECIAL_HANDLING },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_NAME, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_TARGET_DECLARATIVE },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_INITIATOR_NAME, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, 0L },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ALIAS, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, 0L },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_INITIATOR_ALIAS, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, 0L },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ADDRESS, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_TARGET_DECLARATIVE },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_PORTAL_GROUP_TAG, (uint8_t *) "1", (uint8_t *) "1\0""65535\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_DECLARATIVE, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_TARGET_DECLARATIVE },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_INITIAL_R2T, (uint8_t *) "Yes", (uint8_t *) "Yes\0No\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_BOOL_OR, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_DISCOVERY_IGNORE },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_IMMEDIATE_DATA, (uint8_t *) "Yes", (uint8_t *) "Yes\0No\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_BOOL_AND, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_DISCOVERY_IGNORE },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_BURST_LEN, (uint8_t *) "262144", (uint8_t *) "512\0""16777215\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_MIN, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_DISCOVERY_IGNORE | ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_USE_OTHER_MAX_VALUE },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_FIRST_BURST_LEN, (uint8_t *) "65536", (uint8_t *) "512\0""16777215\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_MIN, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_DISCOVERY_IGNORE | ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_USE_PREVIOUS_VALUE },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DEFAULT_TIME_WAIT, (uint8_t *) "2", (uint8_t *) "0\0""3600\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_MAX, 0L },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DEFAULT_TIME_RETAIN, (uint8_t *) "20", (uint8_t *) "0\0""3600\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_MIN, 0L },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_OUTSTANDING_R2T, (uint8_t *) "1", (uint8_t *) "1\0""65536\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_MIN, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_DISCOVERY_IGNORE },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_PDU_IN_ORDER, (uint8_t *) "Yes", (uint8_t *) "Yes\0No\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_BOOL_OR, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_DISCOVERY_IGNORE },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_SEQ_IN_ORDER, (uint8_t *) "Yes", (uint8_t *) "Yes\0No\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_BOOL_OR, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_DISCOVERY_IGNORE },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_ERR_RECOVERY_LEVEL, (uint8_t *) "0", (uint8_t *) "0\0""2\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_MIN, 0L },
-	{ (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_SESSION_TYPE, (uint8_t *) "Normal", (uint8_t *) "Normal\0Discovery\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, 0L },
+	{ ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_CONNECTIONS, (uint8_t *) "1", (uint8_t *) "1\0""65535\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_MIN, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_DISCOVERY_IGNORE },
+	{ ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_SEND_TARGETS, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_SPECIAL_HANDLING },
+	{ ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_NAME, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_TARGET_DECLARATIVE },
+	{ ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_INITIATOR_NAME, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, 0L },
+	{ ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ALIAS, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, 0L },
+	{ ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_INITIATOR_ALIAS, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, 0L },
+	{ ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ADDRESS, (uint8_t *) "", (uint8_t *) "\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_TARGET_DECLARATIVE },
+	{ ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_PORTAL_GROUP_TAG, (uint8_t *) "1", (uint8_t *) "1\0""65535\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_DECLARATIVE, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_TARGET_DECLARATIVE },
+	{ ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_INITIAL_R2T, (uint8_t *) "Yes", (uint8_t *) "Yes\0No\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_BOOL_OR, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_DISCOVERY_IGNORE },
+	{ ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_IMMEDIATE_DATA, (uint8_t *) "Yes", (uint8_t *) "Yes\0No\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_BOOL_AND, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_DISCOVERY_IGNORE },
+	{ ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_BURST_LEN, (uint8_t *) "262144", (uint8_t *) "512\0""16777215\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_MIN, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_DISCOVERY_IGNORE | ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_USE_OTHER_MAX_VALUE },
+	{ ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_FIRST_BURST_LEN, (uint8_t *) "65536", (uint8_t *) "512\0""16777215\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_MIN, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_DISCOVERY_IGNORE | ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_USE_PREVIOUS_VALUE },
+	{ ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DEFAULT_TIME_WAIT, (uint8_t *) "2", (uint8_t *) "0\0""3600\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_MAX, 0L },
+	{ ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DEFAULT_TIME_RETAIN, (uint8_t *) "20", (uint8_t *) "0\0""3600\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_MIN, 0L },
+	{ ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_OUTSTANDING_R2T, (uint8_t *) "1", (uint8_t *) "1\0""65536\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_MIN, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_DISCOVERY_IGNORE },
+	{ ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_PDU_IN_ORDER, (uint8_t *) "Yes", (uint8_t *) "Yes\0No\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_BOOL_OR, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_DISCOVERY_IGNORE },
+	{ ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_SEQ_IN_ORDER, (uint8_t *) "Yes", (uint8_t *) "Yes\0No\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_BOOL_OR, ISCSI_TEXT_KEY_VALUE_PAIR_FLAGS_DISCOVERY_IGNORE },
+	{ ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_ERR_RECOVERY_LEVEL, (uint8_t *) "0", (uint8_t *) "0\0""2\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_NUM_MIN, 0L },
+	{ ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_SESSION_TYPE, (uint8_t *) "Normal", (uint8_t *) "Normal\0Discovery\0", ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_DECLARATIVE, 0L },
 	{ NULL, NULL, NULL, ISCSI_TEXT_KEY_VALUE_PAIR_TYPE_INVALID, 0L }
 };
 
@@ -3471,18 +3471,15 @@ iscsi_session *iscsi_session_create(iscsi_connection *conn, iscsi_target_node *t
 		return NULL;
 	}
 
+	session->flags                  = (ISCSI_SESSION_FLAGS_INIT_R2T | ISCSI_SESSION_FLAGS_IMMEDIATE_DATA | ISCSI_SESSION_FLAGS_DATA_PDU_IN_ORDER | ISCSI_SESSION_FLAGS_DATA_SEQ_IN_ORDER);
+	session->tag                    = conn->pg_tag;
 	session->max_conns              = ISCSI_SESSION_DEFAULT_MAX_CONNECTIONS;
 	session->max_outstanding_r2t    = ISCSI_SESSION_DEFAULT_MAX_OUTSTANDING_R2T;
 	session->default_time_to_wait   = ISCSI_SESSION_DEFAULT_TIME_TO_WAIT;
 	session->default_time_to_retain = ISCSI_SESSION_DEFAULT_TIME_TO_RETAIN;
 	session->first_burst_len        = ISCSI_SESSION_DEFAULT_FIRST_BURST_LEN;
 	session->max_burst_len          = ISCSI_SESSION_DEFAULT_MAX_BURST_LEN;
-	session->init_r2t               = ISCSI_SESSION_DEFAULT_INIT_R2T;
-	session->immediate_data         = ISCSI_SESSION_DEFAULT_IMMEDIATE_DATA;
-	session->data_pdu_in_order      = ISCSI_SESSION_DEFAULT_DATA_PDU_IN_ORDER;
-	session->data_seq_in_order      = ISCSI_SESSION_DEFAULT_DATA_SEQ_IN_ORDER;
 	session->err_recovery_level     = ISCSI_SESSION_DEFAULT_ERR_RECOVERY_LEVEL;
-	session->tag                    = conn->pg_tag;
 
 	session->connections = iscsi_hashmap_create( session->max_conns );
 
@@ -3525,17 +3522,18 @@ iscsi_session *iscsi_session_create(iscsi_connection *conn, iscsi_target_node *t
 	}
 
 	int rc = iscsi_session_init_key_value_pairs( session->key_value_pairs );
-	rc    |= iscsi_update_int_key_value_pair( session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_CONNECTIONS, session->max_conns );
-	rc    |= iscsi_update_int_key_value_pair( session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_OUTSTANDING_R2T, session->max_outstanding_r2t );
-	rc    |= iscsi_update_int_key_value_pair( session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DEFAULT_TIME_WAIT, session->default_time_to_wait );
-	rc    |= iscsi_update_int_key_value_pair( session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DEFAULT_TIME_RETAIN, session->default_time_to_retain );
-	rc    |= iscsi_update_int_key_value_pair( session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_FIRST_BURST_LEN, session->first_burst_len );
-	rc    |= iscsi_update_int_key_value_pair( session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_BURST_LEN, session->max_burst_len );
-	rc    |= iscsi_update_bool_key_value_pair( session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_IMMEDIATE_DATA, session->immediate_data );
-	rc    |= iscsi_update_bool_key_value_pair( session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_PDU_IN_ORDER, session->data_pdu_in_order );
-	rc    |= iscsi_update_bool_key_value_pair( session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_SEQ_IN_ORDER, session->data_seq_in_order );
-	rc    |= iscsi_update_int_key_value_pair( session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_ERR_RECOVERY_LEVEL, session->err_recovery_level );
-	rc    |= iscsi_update_int_key_value_pair( conn->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_RECV_DS_LEN, conn->max_recv_ds_len );
+	rc    |= iscsi_update_int_key_value_pair( session->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_CONNECTIONS, session->max_conns );
+	rc    |= iscsi_update_int_key_value_pair( session->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_OUTSTANDING_R2T, session->max_outstanding_r2t );
+	rc    |= iscsi_update_int_key_value_pair( session->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DEFAULT_TIME_WAIT, session->default_time_to_wait );
+	rc    |= iscsi_update_int_key_value_pair( session->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DEFAULT_TIME_RETAIN, session->default_time_to_retain );
+	rc    |= iscsi_update_int_key_value_pair( session->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_FIRST_BURST_LEN, session->first_burst_len );
+	rc    |= iscsi_update_int_key_value_pair( session->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_BURST_LEN, session->max_burst_len );
+	rc    |= iscsi_update_bool_key_value_pair( session->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_INITIAL_R2T, (session->flags & ISCSI_SESSION_FLAGS_INIT_R2T) );
+	rc    |= iscsi_update_bool_key_value_pair( session->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_IMMEDIATE_DATA, (session->flags & ISCSI_SESSION_FLAGS_IMMEDIATE_DATA) );
+	rc    |= iscsi_update_bool_key_value_pair( session->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_PDU_IN_ORDER, (session->flags & ISCSI_SESSION_FLAGS_DATA_PDU_IN_ORDER) );
+	rc    |= iscsi_update_bool_key_value_pair( session->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_SEQ_IN_ORDER, (session->flags & ISCSI_SESSION_FLAGS_DATA_SEQ_IN_ORDER) );
+	rc    |= iscsi_update_int_key_value_pair( session->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_ERR_RECOVERY_LEVEL, session->err_recovery_level );
+	rc    |= iscsi_update_int_key_value_pair( conn->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_RECV_DS_LEN, conn->max_recv_ds_len );
 
 	if ( rc != 0 ) {
 		logadd( LOG_ERROR, "iscsi_session_create: Out of memory adding iSCSI session key and integer value pair" );
@@ -4004,11 +4002,11 @@ static int iscsi_append_special_key_value_pair_packet(iscsi_connection *conn, is
 			return -1L;
 
 		uint8_t *first_burst_len_val = NULL;
-		int rc = iscsi_get_key_value_pair( conn->session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_FIRST_BURST_LEN, &first_burst_len_val );
+		int rc = iscsi_get_key_value_pair( conn->session->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_FIRST_BURST_LEN, &first_burst_len_val );
 		uint first_burst_len = (rc < 0) ? ISCSI_SESSION_DEFAULT_FIRST_BURST_LEN : (uint) atol( (char *) first_burst_len_val );
 
 		uint8_t *max_burst_len_val;
-		rc = iscsi_get_key_value_pair( conn->session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_BURST_LEN, &max_burst_len_val );
+		rc = iscsi_get_key_value_pair( conn->session->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_BURST_LEN, &max_burst_len_val );
 		uint max_burst_len = (rc < 0) ? ISCSI_SESSION_DEFAULT_MAX_BURST_LEN : (uint) atol( (char *) max_burst_len_val );
 
 		if ( first_burst_len > max_burst_len ) {
@@ -4358,7 +4356,7 @@ int iscsi_negotiate_key_value_pair_callback(uint8_t *key, const size_t key_size,
 			uint first_burst_len = (uint) atol( (char *) value );
 			uint max_burst_len;
 
-			rc = iscsi_get_key_value_pair( key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_BURST_LEN, &max_burst_len_val );
+			rc = iscsi_get_key_value_pair( key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_BURST_LEN, &max_burst_len_val );
 
 			max_burst_len = (rc < 0) ? ISCSI_SESSION_DEFAULT_MAX_BURST_LEN : (uint) atol( (char *) max_burst_len_val );
 
@@ -4415,10 +4413,10 @@ int iscsi_negotiate_key_value_pairs(iscsi_connection *conn, iscsi_hashmap *key_v
 	}
 
 	uint8_t *type;
-	int rc = iscsi_get_key_value_pair( key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_SESSION_TYPE, &type );
+	int rc = iscsi_get_key_value_pair( key_value_pairs, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_SESSION_TYPE, &type );
 
 	if ( rc < 0 )
-		rc = iscsi_get_key_value_pair( conn->session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_SESSION_TYPE, &type );
+		rc = iscsi_get_key_value_pair( conn->session->key_value_pairs, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_SESSION_TYPE, &type );
 
 	const int discovery = ((rc == 0) && (strcasecmp( (char *) type, "Discovery" ) == 0)) ? 1L : 0L;
 
@@ -4444,7 +4442,7 @@ int iscsi_connection_copy_key_value_pairs(iscsi_connection *conn)
 {
 	int32_t int_val;
 
-	int rc = iscsi_get_int_key_value_pair( conn->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_RECV_DS_LEN, &int_val);
+	int rc = iscsi_get_int_key_value_pair( conn->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_RECV_DS_LEN, &int_val);
 
 	if ( rc != 0 )
 		return rc;
@@ -4456,61 +4454,65 @@ int iscsi_connection_copy_key_value_pairs(iscsi_connection *conn)
 
 	uint8_t *value;
 
-	rc = iscsi_get_key_value_pair( conn->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_HEADER_DIGEST, &value);
+	rc = iscsi_get_key_value_pair( conn->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_HEADER_DIGEST, &value);
 
 	if ( rc != 0 )
 		return rc;
 
 	conn->header_digest = (strcasecmp( (char *) value, "CRC32C" ) == 0) ? ISCSI_DIGEST_SIZE : 0L;
 
-	rc = iscsi_get_key_value_pair( conn->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_DIGEST, &value);
+	rc = iscsi_get_key_value_pair( conn->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_DIGEST, &value);
 
 	if ( rc != 0 )
 		return rc;
 
 	conn->data_digest = (strcasecmp( (char *) value, "CRC32C" ) == 0) ? ISCSI_DIGEST_SIZE : 0L;
 
-	rc = iscsi_get_int_key_value_pair( conn->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_CONNECTIONS, &int_val);
+	rc = iscsi_get_int_key_value_pair( conn->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_CONNECTIONS, &int_val);
 
 	if ( rc != 0 )
 		return rc;
 
 	conn->session->max_conns = int_val;
 
-	rc = iscsi_get_int_key_value_pair( conn->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_OUTSTANDING_R2T, &int_val);
+	rc = iscsi_get_int_key_value_pair( conn->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_OUTSTANDING_R2T, &int_val);
 
 	if ( rc != 0 )
 		return rc;
 
 	conn->session->max_outstanding_r2t = int_val;
 
-	rc = iscsi_get_int_key_value_pair( conn->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_FIRST_BURST_LEN, &int_val);
+	rc = iscsi_get_int_key_value_pair( conn->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_FIRST_BURST_LEN, &int_val);
 
 	if ( rc != 0 )
 		return rc;
 
 	conn->session->first_burst_len = int_val;
 
-	rc = iscsi_get_int_key_value_pair( conn->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_BURST_LEN, &int_val);
+	rc = iscsi_get_int_key_value_pair( conn->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_BURST_LEN, &int_val);
 
 	if ( rc != 0 )
 		return rc;
 
 	conn->session->max_burst_len = int_val;
 
-	rc = iscsi_get_bool_key_value_pair( conn->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_INITIAL_R2T, &int_val);
+	rc = iscsi_get_bool_key_value_pair( conn->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_INITIAL_R2T, &int_val);
 
 	if ( rc != 0 )
 		return rc;
 
-	conn->session->init_r2t = int_val;
+	conn->session->flags &= ~(ISCSI_SESSION_FLAGS_INIT_R2T | ISCSI_SESSION_FLAGS_IMMEDIATE_DATA);
+
+	if ( int_val != 0 )
+		conn->session->flags |= ISCSI_SESSION_FLAGS_INIT_R2T;
 
-	rc = iscsi_get_bool_key_value_pair( conn->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_IMMEDIATE_DATA, &int_val);
+	rc = iscsi_get_bool_key_value_pair( conn->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_IMMEDIATE_DATA, &int_val);
 
 	if ( rc != 0 )
 		return rc;
 
-	conn->session->immediate_data = int_val;
+	if ( int_val != 0 )
+		conn->session->flags |= ISCSI_SESSION_FLAGS_IMMEDIATE_DATA;
 
 	return 0L;
 }
@@ -4855,7 +4857,7 @@ static int iscsi_connection_login_init_port(iscsi_connection *conn, iscsi_pdu *r
 {
 	iscsi_login_response_packet *login_response_pkt = (iscsi_login_response_packet *) response_pdu->bhs_pkt;
 	uint8_t *init_name;
-	int rc = iscsi_get_key_value_pair( key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_INITIATOR_NAME, &init_name );
+	int rc = iscsi_get_key_value_pair( key_value_pairs, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_INITIATOR_NAME, &init_name );
 
 	if ( rc != 0 ) {
 		login_response_pkt->status_class  = ISCSI_LOGIN_RESPONSE_STATUS_CLASS_CLIENT_ERR;
@@ -4912,7 +4914,7 @@ static int iscsi_connection_login_session_type(iscsi_pdu *login_response_pdu, is
 {
 	iscsi_login_response_packet *login_response_pkt = (iscsi_login_response_packet *) login_response_pdu->bhs_pkt;
 	uint8_t *type_str;
-	int rc = iscsi_get_key_value_pair( key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_SESSION_TYPE, &type_str );
+	int rc = iscsi_get_key_value_pair( key_value_pairs, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_SESSION_TYPE, &type_str );
 
 	if ( (rc == 0) && (type_str != NULL) ) {
 		if ( strcasecmp( (char *) type_str, "Discovery" ) == 0 ) {
@@ -4986,17 +4988,30 @@ static int iscsi_connection_login_check_target(iscsi_connection *conn, iscsi_pdu
 	uint8_t *redirect_adr = iscsi_target_node_get_redirect( conn, *target );
 
 	if ( redirect_adr != NULL ) {
-		if ( iscsi_update_key_value_pair( login_response_pdu->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ADDRESS, redirect_adr ) == 0 ) {
-			login_response_pkt->status_class  = ISCSI_LOGIN_RESPONSE_STATUS_CLASS_REDIRECT;
-			login_response_pkt->status_detail = ISCSI_LOGIN_RESPONSE_STATUS_DETAILS_REDIRECT_TEMP;
+		iscsi_key_value_pair *key_value_pair;
+		const int rc = iscsi_hashmap_get( iscsi_globvec->session_key_value_pairs,  ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ADDRESS, strlen( (char *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ADDRESS ) + 1, (uint8_t **) &key_value_pair);
 
-			return ISCSI_CONNECT_PDU_READ_ERR_LOGIN_RESPONSE;
+		if ( rc < 0 ) {
+			login_response_pkt->status_class  = ISCSI_LOGIN_RESPONSE_STATUS_CLASS_SERVER_ERR;
+			login_response_pkt->status_detail = ISCSI_LOGIN_RESPONSE_STATUS_DETAILS_SERVER_ERR_OUT_OF_RESOURCES;
+
+			return ISCSI_CONNECT_PDU_READ_ERR_FATAL;
 		}
 
-		login_response_pkt->status_class  = ISCSI_LOGIN_RESPONSE_STATUS_CLASS_SERVER_ERR;
-		login_response_pkt->status_detail = ISCSI_LOGIN_RESPONSE_STATUS_DETAILS_SERVER_ERR_OUT_OF_RESOURCES;
+		const int ds_len = iscsi_append_key_value_pair_packet( key_value_pair, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ADDRESS, redirect_adr, (uint8_t *) login_response_pdu->ds_cmd_data, login_response_pdu->ds_len, login_response_pdu->len );
 
-		return ISCSI_CONNECT_PDU_READ_ERR_FATAL;
+		if ( ds_len < 0 ) {
+			login_response_pkt->status_class  = ISCSI_LOGIN_RESPONSE_STATUS_CLASS_SERVER_ERR;
+			login_response_pkt->status_detail = ISCSI_LOGIN_RESPONSE_STATUS_DETAILS_SERVER_ERR_OUT_OF_RESOURCES;
+
+			return ISCSI_CONNECT_PDU_READ_ERR_FATAL;
+		}
+
+		login_response_pdu->ds_len = ds_len;
+		login_response_pkt->status_class  = ISCSI_LOGIN_RESPONSE_STATUS_CLASS_REDIRECT;
+		login_response_pkt->status_detail = ISCSI_LOGIN_RESPONSE_STATUS_DETAILS_REDIRECT_TEMP;
+
+		return ISCSI_CONNECT_PDU_READ_ERR_LOGIN_RESPONSE;
 	}
 
 	if ( iscsi_target_node_access( conn, *target, conn->init_name, conn->init_adr ) < 0 ) {
@@ -5159,18 +5174,10 @@ iscsi_pdu *iscsi_connection_pdu_create(iscsi_connection *conn)
 		return NULL;
 	}
 
-	pdu->ahs_pkt                = NULL;
-	pdu->header_digest          = NULL;
-	pdu->ds_cmd_data            = NULL;
-	pdu->data_digest            = NULL;
-	pdu->key_value_pairs        = iscsi_hashmap_create( 32UL );
-
-	if ( pdu->key_value_pairs == NULL ) {
-		free( pdu );
-
-		return NULL;
-	}
-
+	pdu->ahs_pkt                 = NULL;
+	pdu->header_digest           = NULL;
+	pdu->ds_cmd_data             = NULL;
+	pdu->data_digest             = NULL;
 	pdu->task                    = NULL;
 	pdu->xfer_complete_callback  = NULL;
 	pdu->xfer_complete_user_data = NULL;
@@ -5204,13 +5211,6 @@ iscsi_pdu *iscsi_connection_pdu_create(iscsi_connection *conn)
 void iscsi_connection_pdu_destroy(iscsi_pdu *pdu)
 {
 	if ( pdu != NULL ) {
-		if ( pdu->key_value_pairs != NULL ) {
-			iscsi_hashmap_iterate( pdu->key_value_pairs, iscsi_hashmap_key_destroy_value_callback, NULL );
-			iscsi_hashmap_destroy( pdu->key_value_pairs );
-
-			pdu->key_value_pairs = NULL;
-		}
-
 		if ( pdu->bhs_pkt != NULL ) {
 			free( pdu->bhs_pkt );
 
@@ -6269,9 +6269,9 @@ static int iscsi_connection_chap_negotiate(iscsi_connection *conn)
 	int rc = 0L;
 
 	if ( (conn->flags & ISCSI_CONNECT_FLAGS_CHAP_DISABLE) != 0 )
-		rc = iscsi_update_key_value_pair( conn->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD, (uint8_t *) "None" );
+		rc = iscsi_update_key_value_pair( conn->key_value_pairs, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD, (uint8_t *) "None" );
 	else if ( (conn->flags & ISCSI_CONNECT_FLAGS_CHAP_REQUIRE) != 0 )
-		rc = iscsi_update_key_value_pair( conn->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD, (uint8_t *) "CHAP" );
+		rc = iscsi_update_key_value_pair( conn->key_value_pairs, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD, (uint8_t *) "CHAP" );
 
 	return rc;
 }
@@ -6356,10 +6356,10 @@ static int iscsi_connection_login_digest_negotiate(iscsi_connection *conn, const
 	int rc = 0L;
 
 	if ( target->header_digest != 0 )
-		rc = iscsi_update_key_value_pair( conn->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_HEADER_DIGEST, (uint8_t *) "CRC32C" );
+		rc = iscsi_update_key_value_pair( conn->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_HEADER_DIGEST, (uint8_t *) "CRC32C" );
 
 	if ( target->data_digest != 0 )
-		rc = iscsi_update_key_value_pair( conn->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_DIGEST, (uint8_t *) "CRC32C" );
+		rc = iscsi_update_key_value_pair( conn->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_DIGEST, (uint8_t *) "CRC32C" );
 
 	return rc;
 }
@@ -6387,7 +6387,7 @@ static int iscsi_connection_login_session_normal(iscsi_connection *conn, iscsi_p
 	iscsi_target_node *target = NULL;
 	uint8_t *target_name;
 	iscsi_login_response_packet *login_response_pkt = (iscsi_login_response_packet *) login_response_pdu->bhs_pkt;
-	int rc = iscsi_get_key_value_pair( key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_NAME, &target_name );
+	int rc = iscsi_get_key_value_pair( key_value_pairs, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_NAME, &target_name );
 
 	if ( (rc < 0) || (target_name == NULL) ) {
 		login_response_pkt->status_class  = ISCSI_LOGIN_RESPONSE_STATUS_CLASS_CLIENT_ERR;
@@ -6516,7 +6516,7 @@ static int iscsi_connection_login_set_target_info(iscsi_connection *conn, iscsi_
 	int rc;
 
 	if ( target != NULL ) {
-		rc = iscsi_update_key_value_pair( conn->session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ALIAS, ((target->alias != NULL) ? target->alias : (uint8_t *) "") );
+		rc = iscsi_update_key_value_pair( conn->session->key_value_pairs, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ALIAS, ((target->alias != NULL) ? target->alias : (uint8_t *) "") );
 
 		if ( rc < 0 )
 			return ISCSI_CONNECT_PDU_READ_ERR_LOGIN_PARAMETER;
@@ -6527,46 +6527,70 @@ static int iscsi_connection_login_set_target_info(iscsi_connection *conn, iscsi_
 	if ( tmp_buf == NULL )
 		return ISCSI_CONNECT_PDU_READ_ERR_FATAL;
 
-	rc = iscsi_update_key_value_pair( conn->session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ADDRESS, tmp_buf );
+	rc = iscsi_update_key_value_pair( conn->session->key_value_pairs, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ADDRESS, tmp_buf );
 
 	free( tmp_buf );
 
 	if ( rc < 0 )
 		return ISCSI_CONNECT_PDU_READ_ERR_LOGIN_PARAMETER;
 
-	rc = iscsi_update_int_key_value_pair( conn->session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_PORTAL_GROUP_TAG, conn->pg_tag );
+	rc = iscsi_update_int_key_value_pair( conn->session->key_value_pairs, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_PORTAL_GROUP_TAG, conn->pg_tag );
 
 	if ( rc < 0 )
 		return ISCSI_CONNECT_PDU_READ_ERR_LOGIN_PARAMETER;
 
 	if ( target != NULL ) {
-		rc = iscsi_get_key_value_pair( conn->session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ALIAS, &tmp_buf );
+		rc = iscsi_get_key_value_pair( conn->session->key_value_pairs, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ALIAS, &tmp_buf );
 
 		if ( (rc == 0) && (strlen( (char *) tmp_buf ) != 0) ) {
-			rc = iscsi_update_key_value_pair( login_response_pdu->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ALIAS, tmp_buf );
+			iscsi_key_value_pair *key_value_pair;
+			rc = iscsi_hashmap_get( iscsi_globvec->session_key_value_pairs,  ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ALIAS, strlen( (char *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ALIAS ) + 1, (uint8_t **) &key_value_pair);
 
 			if ( rc < 0 )
 				return ISCSI_CONNECT_PDU_READ_ERR_FATAL;
+
+			const int ds_len = iscsi_append_key_value_pair_packet( key_value_pair, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ALIAS, tmp_buf, (uint8_t *) login_response_pdu->ds_cmd_data, login_response_pdu->ds_len, login_response_pdu->len );
+
+			if ( ds_len < 0 )
+				return ISCSI_CONNECT_PDU_READ_ERR_FATAL;
+
+			login_response_pdu->ds_len = ds_len;
 		}
 
 		if ( type == ISCSI_SESSION_TYPE_DISCOVERY ) {
-			rc = iscsi_get_key_value_pair( conn->session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ADDRESS, &tmp_buf );
+			rc = iscsi_get_key_value_pair( conn->session->key_value_pairs, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ADDRESS, &tmp_buf );
 
 			if ( (rc == 0) && (strlen( (char *) tmp_buf ) != 0) ) {
-				rc = iscsi_update_key_value_pair( login_response_pdu->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ADDRESS, tmp_buf );
+				iscsi_key_value_pair *key_value_pair;
+				rc = iscsi_hashmap_get( iscsi_globvec->session_key_value_pairs,  ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ADDRESS, strlen( (char *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ADDRESS ) + 1, (uint8_t **) &key_value_pair);
 
 				if ( rc < 0 )
 					return ISCSI_CONNECT_PDU_READ_ERR_FATAL;
+
+				const int ds_len = iscsi_append_key_value_pair_packet( key_value_pair, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ADDRESS, tmp_buf, (uint8_t *) login_response_pdu->ds_cmd_data, login_response_pdu->ds_len, login_response_pdu->len );
+
+				if ( ds_len < 0 )
+					return ISCSI_CONNECT_PDU_READ_ERR_FATAL;
+
+				login_response_pdu->ds_len = ds_len;
 			}
 		}
 
-		rc = iscsi_get_key_value_pair( conn->session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_PORTAL_GROUP_TAG, &tmp_buf );
+		rc = iscsi_get_key_value_pair( conn->session->key_value_pairs, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_PORTAL_GROUP_TAG, &tmp_buf );
 
 		if ( rc == 0 ) {
-			rc = iscsi_update_key_value_pair( login_response_pdu->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_PORTAL_GROUP_TAG, tmp_buf );
+			iscsi_key_value_pair *key_value_pair;
+			rc = iscsi_hashmap_get( iscsi_globvec->session_key_value_pairs,  ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_PORTAL_GROUP_TAG, strlen( (char *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_PORTAL_GROUP_TAG ) + 1, (uint8_t **) &key_value_pair);
 
 			if ( rc < 0 )
 				return ISCSI_CONNECT_PDU_READ_ERR_FATAL;
+
+			const int ds_len = iscsi_append_key_value_pair_packet( key_value_pair, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_PORTAL_GROUP_TAG, tmp_buf, (uint8_t *) login_response_pdu->ds_cmd_data, login_response_pdu->ds_len, login_response_pdu->len );
+
+			if ( ds_len < 0 )
+				return ISCSI_CONNECT_PDU_READ_ERR_FATAL;
+
+			login_response_pdu->ds_len = ds_len;
 		}
 	}
 
@@ -6632,7 +6656,7 @@ static int iscsi_connection_handle_login_phase_none(iscsi_connection *conn, iscs
 	if ( type == ISCSI_SESSION_TYPE_DISCOVERY ) {
 		conn->session->max_conns = 1;
 
-		rc = iscsi_add_int_key_value_pair( conn->session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_CONNECTIONS, conn->session->max_conns );
+		rc = iscsi_add_int_key_value_pair( conn->session->key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_CONNECTIONS, conn->session->max_conns );
 
 		if ( rc < 0 )
 			return ISCSI_CONNECT_PDU_READ_ERR_LOGIN_PARAMETER;
@@ -6664,7 +6688,7 @@ static int iscsi_connecction_handle_login_response_csg_bit(iscsi_connection *con
 	switch ( ISCSI_LOGIN_RESPONSE_FLAGS_GET_CURRENT_STAGE(login_response_pkt->flags) ) {
 		case ISCSI_LOGIN_RESPONSE_FLAGS_CURRENT_STAGE_SECURITY_NEGOTIATION : {
 			uint8_t *auth_method;
-			const int rc = iscsi_get_key_value_pair( key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD, (uint8_t **) &auth_method );
+			const int rc = iscsi_get_key_value_pair( key_value_pairs, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD, (uint8_t **) &auth_method );
 
 			if ( rc < 0 ) {
 				login_response_pkt->status_class  = ISCSI_LOGIN_RESPONSE_STATUS_CLASS_CLIENT_ERR;
@@ -7034,11 +7058,11 @@ static int iscsi_connection_pdu_data_handle_text_req(iscsi_connection *conn, isc
 		text_response_pkt->flags |= (int8_t) ISCSI_TEXT_RESPONSE_FLAGS_FINAL;
 
 	uint8_t *send_targets_val;
-	rc = iscsi_get_key_value_pair( key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_SEND_TARGETS, &send_targets_val );
+	rc = iscsi_get_key_value_pair( key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_SEND_TARGETS, &send_targets_val );
 
 	if ( rc < 0 ) {
 		uint8_t *type_val;
-		rc = iscsi_get_key_value_pair( conn->session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_SESSION_TYPE, &type_val );
+		rc = iscsi_get_key_value_pair( conn->session->key_value_pairs, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_SESSION_TYPE, &type_val );
 
 		if ( (rc >= 0) && (type_val != NULL) && (strcasecmp( (char *) type_val, "Discovery" ) == 0) ) {
 			iscsi_hashmap_iterate( key_value_pairs, iscsi_hashmap_key_destroy_value_callback, NULL );
@@ -7049,7 +7073,7 @@ static int iscsi_connection_pdu_data_handle_text_req(iscsi_connection *conn, isc
 		}
 	} else {
 		uint8_t *type_val;
-		rc = iscsi_get_key_value_pair( conn->session->key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_SESSION_TYPE, &type_val );
+		rc = iscsi_get_key_value_pair( conn->session->key_value_pairs, ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_SESSION_TYPE, &type_val );
 
 		if ( (rc >= 0) && (type_val != NULL) && (strcasecmp( (char *) type_val, "Discovery" ) == 0) ) {
 			if ( send_targets_val[0] == '\0' )
@@ -7062,7 +7086,7 @@ static int iscsi_connection_pdu_data_handle_text_req(iscsi_connection *conn, isc
 
 			if ( strcasecmp( (char *) send_targets_val, "ALL" ) == 0 ) {
 				iscsi_key_value_pair *key_value_pair;
-				rc = iscsi_hashmap_get( iscsi_globvec->session_key_value_pairs, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_SEND_TARGETS, strlen( ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_SEND_TARGETS ) + 1, (uint8_t **) &key_value_pair);
+				rc = iscsi_hashmap_get( iscsi_globvec->session_key_value_pairs, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_SEND_TARGETS, strlen( (char *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_SEND_TARGETS ) + 1, (uint8_t **) &key_value_pair);
 
 				if ( rc < 0 ) {
 					iscsi_hashmap_iterate( key_value_pairs, iscsi_hashmap_key_destroy_value_callback, NULL );
@@ -7072,7 +7096,7 @@ static int iscsi_connection_pdu_data_handle_text_req(iscsi_connection *conn, isc
 					return ISCSI_CONNECT_PDU_READ_ERR_FATAL;
 				}
 
-				response_pdu->pos = iscsi_append_key_value_pair_packet( key_value_pair, (uint8_t *) ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_SEND_TARGETS, (uint8_t *) "Reject", (uint8_t *) response_pdu->ds_cmd_data, response_pdu->pos, response_pdu->ds_len );
+				response_pdu->pos = iscsi_append_key_value_pair_packet( key_value_pair, ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_SEND_TARGETS, (uint8_t *) "Reject", (uint8_t *) response_pdu->ds_cmd_data, response_pdu->pos, response_pdu->ds_len );
 			} else {
 				response_pdu->pos = iscsi_target_node_send( conn, send_targets_val, conn->init_name, (uint8_t *) response_pdu->ds_cmd_data, response_pdu->pos, response_pdu->ds_len );
 			}
diff --git a/src/server/iscsi.h b/src/server/iscsi.h
index df737b6..f944146 100644
--- a/src/server/iscsi.h
+++ b/src/server/iscsi.h
@@ -2539,7 +2539,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * SessionType key is thus going to be offered as "Discovery", it SHOULD
  * be offered in the initial Login Request by the initiator.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_SESSION_TYPE            "SessionType\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_SESSION_TYPE            ((const uint8_t *) "SessionType\0\0\0\0")
 
 /**
  * @brief Key used during SecurityNegotiation stage of Login Phase: Initiator name.
@@ -2560,7 +2560,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * itself to the remote endpoint.\n
  * The InitiatorName MUST NOT be redeclared within the Login Phase.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_INITIATOR_NAME          "InitiatorName\0\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_INITIATOR_NAME          ((const uint8_t *) "InitiatorName\0\0")
 
 /**
  * @brief Key used during SecurityNegotiation stage of Login Phase: Target name.
@@ -2584,7 +2584,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * Request (which is its only use when issued by a target).\n
  * The TargetName MUST NOT be redeclared within the Login Phase.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_NAME             "TargetName\0\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_NAME             ((const uint8_t *) "TargetName\0\0\0\0\0")
 
 /**
  * @brief Key used during SecurityNegotiation stage of Login Phase: Target address.
@@ -2614,7 +2614,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * The formats for the port and portal-group-tag are the same as the one
  * specified in TargetPortalGroupTag.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ADDRESS          "TargetAddress\0\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ADDRESS          ((const uint8_t *) "TargetAddress\0\0")
 
 /**
  * @brief Key used during SecurityNegotiation stage of Login Phase: Initiator alias.
@@ -2637,7 +2637,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * the target's user interface in a list of initiators to which it is
  * connected.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_INITIATOR_ALIAS         "InitiatorAlias\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_INITIATOR_ALIAS         ((const uint8_t *) "InitiatorAlias\0")
 
 /**
  * @brief Key used during SecurityNegotiation stage of Login Phase: Target alias.
@@ -2659,7 +2659,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * authorization decisions. It can be displayed by the initiator's user
  * interface in a list of targets to which it is connected.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ALIAS            "TargetAlias\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_ALIAS            ((const uint8_t *) "TargetAlias\0\0\0\0")
 
 /**
  * @brief Key used during SecurityNegotiation stage of Login Phase: Target portal group tag.
@@ -2684,7 +2684,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * legal value for the TPGT. This discrepancy currently stands
  * corrected in SAM4.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_PORTAL_GROUP_TAG "TargetPortalGroupTag\0\0\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_TARGET_PORTAL_GROUP_TAG ((const uint8_t *) "TargetPortalGroupTag\0\0\0")
 
 /**
  * @brief Key used during SecurityNegotiation stage of Login Phase: Authentication method.
@@ -2746,7 +2746,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * Support for public or private extension authentication methods is
  * OPTIONAL.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD             "AuthMethod\0\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD             ((const uint8_t *) "AuthMethod\0\0\0\0\0")
 
 
 /**
@@ -2778,7 +2778,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * encoded form) MUST NOT exceed 65536 bytes. Hex or Base64 encoding
  * may be used for KRB_AP_REQ and KRB_AP_REP.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_KRB_AP_REQ "KRB_AP_REQ\0\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_KRB_AP_REQ ((const uint8_t *) "KRB_AP_REQ\0\0\0\0\0")
 
 /**
  * @brief Key used during SecurityNegotiation stage of Login Phase: Kerberos V5 (KRB5): KRB_AP_REP.
@@ -2809,7 +2809,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * encoded form) MUST NOT exceed 65536 bytes. Hex or Base64 encoding
  * may be used for KRB_AP_REQ and KRB_AP_REP.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_KRB_AP_REP "KRB_AP_REP\0\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_KRB_AP_REP ((const uint8_t *) "KRB_AP_REP\0\0\0\0\0")
 
 
 /**
@@ -2863,7 +2863,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * supported by initiators and targets. To guarantee interoperability,
  * targets MUST always offer "SRP-1536" as one of the proposed groups.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_SRP_SRP_U     "SRP_U\0\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_SRP_SRP_U     ((const uint8_t *) "SRP_U\0\0")
 
 /**
  * @brief Key used during SecurityNegotiation stage of Login Phase: Secure Remote Password (SRP): SRP_GROUP.
@@ -2916,7 +2916,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * supported by initiators and targets. To guarantee interoperability,
  * targets MUST always offer "SRP-1536" as one of the proposed groups.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_SRP_SRP_GROUP "SRP_GROUP\0\0\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_SRP_SRP_GROUP ((const uint8_t *) "SRP_GROUP\0\0\0\0\0\0")
 
 /**
  * @brief Key used during SecurityNegotiation stage of Login Phase: Secure Remote Password (SRP): SRP_A.
@@ -2969,7 +2969,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * supported by initiators and targets. To guarantee interoperability,
  * targets MUST always offer "SRP-1536" as one of the proposed groups.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_SRP_SRP_A     "SRP_A\0\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_SRP_SRP_A     ((const uint8_t *) "SRP_A\0\0")
 
 /**
  * @brief Key used during SecurityNegotiation stage of Login Phase: Secure Remote Password (SRP): SRP_B.
@@ -3022,7 +3022,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * supported by initiators and targets. To guarantee interoperability,
  * targets MUST always offer "SRP-1536" as one of the proposed groups.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_SRP_SRP_B     "SRP_B\0\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_SRP_SRP_B     ((const uint8_t *) "SRP_B\0\0")
 
 /**
  * @brief Key used during SecurityNegotiation stage of Login Phase: Secure Remote Password (SRP): SRP_M.
@@ -3075,7 +3075,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * supported by initiators and targets. To guarantee interoperability,
  * targets MUST always offer "SRP-1536" as one of the proposed groups.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_SRP_SRP_M     "SRP_M\0\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_SRP_SRP_M     ((const uint8_t *) "SRP_M\0\0")
 
 /**
  * @brief Key used during SecurityNegotiation stage of Login Phase: Secure Remote Password (SRP): SRP_HM.
@@ -3128,7 +3128,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * supported by initiators and targets. To guarantee interoperability,
  * targets MUST always offer "SRP-1536" as one of the proposed groups.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_SRP_SRP_HM    "SRP_HM\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_SRP_SRP_HM    ((const uint8_t *) "SRP_HM\0")
 
 
 /**
@@ -3185,7 +3185,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * To guarantee interoperability, initiators MUST always offer it as one
  * of the proposed algorithms.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_A "CHAP_A\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_A ((const uint8_t *) "CHAP_A\0")
 
 /**
  * @brief Key used during SecurityNegotiation stage of Login Phase: Challenge Handshake Authentication Protocol (CHAP): CHAP_I.
@@ -3241,7 +3241,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * To guarantee interoperability, initiators MUST always offer it as one
  * of the proposed algorithms.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_I "CHAP_I\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_I ((const uint8_t *) "CHAP_I\0")
 
 /**
  * @brief Key used during SecurityNegotiation stage of Login Phase: Challenge Handshake Authentication Protocol (CHAP): CHAP_C.
@@ -3297,7 +3297,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * To guarantee interoperability, initiators MUST always offer it as one
  * of the proposed algorithms.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_C "CHAP_C\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_C ((const uint8_t *) "CHAP_C\0")
 
 /**
  * @brief Key used during SecurityNegotiation stage of Login Phase: Challenge Handshake Authentication Protocol (CHAP): CHAP_N.
@@ -3353,7 +3353,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * To guarantee interoperability, initiators MUST always offer it as one
  * of the proposed algorithms.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_N "CHAP_N\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_N ((const uint8_t *) "CHAP_N\0")
 
 /**
  * @brief Key used during SecurityNegotiation stage of Login Phase: Challenge Handshake Authentication Protocol (CHAP): CHAP_R.
@@ -3409,7 +3409,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * To guarantee interoperability, initiators MUST always offer it as one
  * of the proposed algorithms.
  */
-#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_R "CHAP_R\0"
+#define ISCSI_LOGIN_AUTH_SECURITY_TEXT_KEY_AUTH_METHOD_CHAP_CHAP_R ((const uint8_t *) "CHAP_R\0")
 
 /* Login/Text Operational Text Keys
 
@@ -3527,7 +3527,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * standard-label specified.\n
  * Support for public or private extension digests is OPTIONAL.
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_HEADER_DIGEST "HeaderDigest\0\0\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_HEADER_DIGEST ((const uint8_t *) "HeaderDigest\0\0\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: Data digest.
@@ -3609,7 +3609,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * standard-label specified.\n
  * Support for public or private extension digests is OPTIONAL.
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_DIGEST   "DataDigest\0\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_DIGEST   ((const uint8_t *) "DataDigest\0\0\0\0\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: New connections.
@@ -3626,7 +3626,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * The initiator and target negotiate the maximum number of connections
  * requested/acceptable.
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_CONNECTIONS "MaxConnections\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_CONNECTIONS ((const uint8_t *) "MaxConnections\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: Send targets.
@@ -3790,7 +3790,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * multiple connections per session; it is communicated via the
  * MaxConnections text key upon login to the target.
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_SEND_TARGETS "SendTargets\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_SEND_TARGETS ((const uint8_t *) "SendTargets\0\0\0\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: Initial Ready To Transfer.
@@ -3819,7 +3819,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * Only the first outgoing data burst (immediate data and/or separate
  * PDUs) can be sent unsolicited (i.e., not requiring an explicit R2T).
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_INITIAL_R2T "InitialR2T\0\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_INITIAL_R2T ((const uint8_t *) "InitialR2T\0\0\0\0\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: Immediate data.
@@ -3856,7 +3856,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * | Yes      | No            | No                        | No          |
  * | Yes      | Yes           | No                        | Yes         |
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_IMMEDIATE_DATA "ImmediateData\0\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_IMMEDIATE_DATA ((const uint8_t *) "ImmediateData\0\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: Maximum receive DataSegmentLength.
@@ -3879,7 +3879,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * unsolicited PDUs exceeding FirstBurstLength (or FirstBurstLength-
  * Immediate Data Length if immediate data were sent).
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_RECV_DS_LEN "MaxRecvDataSegmentLength\0\0\0\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_RECV_DS_LEN ((const uint8_t *) "MaxRecvDataSegmentLength\0\0\0\0\0\0\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: Maximum burst length.
@@ -3898,7 +3898,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * sequence consists of one or more consecutive Data-In or Data-Out PDUs
  * that end with a Data-In or Data-Out PDU with the F bit set to 1.
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_BURST_LEN "MaxBurstLength\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_BURST_LEN ((const uint8_t *) "MaxBurstLength\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: First burst length.
@@ -3920,7 +3920,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * follow the command.\n
  * FirstBurstLength MUST NOT exceed MaxBurstLength.
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_FIRST_BURST_LEN "FirstBurstLength\0\0\0\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_FIRST_BURST_LEN ((const uint8_t *) "FirstBurstLength\0\0\0\0\0\0\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: Default time to wait.
@@ -3940,7 +3940,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * A value of 0 indicates that logout or active task reassignment can be
  * attempted immediately.
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DEFAULT_TIME_WAIT "DefaultTime2Wait\0\0\0\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DEFAULT_TIME_WAIT ((const uint8_t *) "DefaultTime2Wait\0\0\0\0\0\0\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: Default time to retain.
@@ -3962,7 +3962,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * A value of 0 indicates that connection/task state is immediately
  * discarded by the target.
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DEFAULT_TIME_RETAIN "DefaultTime2Retain\0\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DEFAULT_TIME_RETAIN ((const uint8_t *) "DefaultTime2Retain\0\0\0\0\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: Maximum outstanding Ready To Transfer.
@@ -3982,7 +3982,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * PDU (with the F bit set to 1) is transferred or a sequence reception
  * timeout is encountered for that data sequence.
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_OUTSTANDING_R2T "MaxOutstandingR2T\0\0\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_MAX_OUTSTANDING_R2T ((const uint8_t *) "MaxOutstandingR2T\0\0\0\0\0\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: Data Protocol Data Unit (PDU) in order.
@@ -4001,7 +4001,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * sequences have to be at continuously increasing addresses and
  * overlays are forbidden.
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_PDU_IN_ORDER "DataPDUInOrder\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_PDU_IN_ORDER ((const uint8_t *) "DataPDUInOrder\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: Data sequence in order.
@@ -4031,7 +4031,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * not 0 and DataSequenceInOrder is set to Yes, then MaxOutstandingR2T
  * MUST be set to 1.
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_SEQ_IN_ORDER "DataSequenceInOrder\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_DATA_SEQ_IN_ORDER ((const uint8_t *) "DataSequenceInOrder\0\0\0\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: Error recovery level.
@@ -4051,7 +4051,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * In the description of recovery mechanisms, certain recovery classes
  * are specified.
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_ERR_RECOVERY_LEVEL "ErrorRecoveryLevel\0\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_ERR_RECOVERY_LEVEL ((const uint8_t *) "ErrorRecoveryLevel\0\0\0\0\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: X reversed vendor.
@@ -4074,7 +4074,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * Vendor-specific keys MUST ONLY be used in Normal sessions.\n
  * Support for public or private extension keys is OPTIONAL.
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_PRIV_EXT_KEY_FMT "X-reversed.vendor\0\0\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_PRIV_EXT_KEY_FMT ((const uint8_t *) "X-reversed.vendor\0\0\0\0\0\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: Task reporting.
@@ -4102,7 +4102,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * When TaskReporting is not negotiated to FastAbort, the
  * standard multi-task abort semantics MUST be used.
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_TASK_REPORTING "TaskReporting\0\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_TASK_REPORTING ((const uint8_t *) "TaskReporting\0\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: X Node architecture.
@@ -4151,7 +4151,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * silent (the node does not transmit any key value and simply discards
  * any key values it receives without issuing a NotUnderstood response).
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_X_NODE_ARCH "X#NodeArchitecture\0\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_X_NODE_ARCH ((const uint8_t *) "X#NodeArchitecture\0\0\0\0\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: IFMarker (obseleted).
@@ -4170,7 +4170,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * implementation MUST NOT respond with a "NotUnderstood" value for
  * either of these keys.
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_IF_MARKER   "IFMarker\0\0\0\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_IF_MARKER   ((const uint8_t *) "IFMarker\0\0\0\0\0\0\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: OFMarker (obseleted).
@@ -4189,7 +4189,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * implementation MUST NOT respond with a "NotUnderstood" value for
  * either of these keys.
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_OF_MARKER   "OFMarker\0\0\0\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_OF_MARKER   ((const uint8_t *) "OFMarker\0\0\0\0\0\0\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: OFMarkInt (obseleted).
@@ -4208,7 +4208,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * implementation MUST NOT respond with a "NotUnderstood" value for
  * either of these keys.
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_OF_MARK_INT "OFMarkInt\0\0\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_OF_MARK_INT ((const uint8_t *) "OFMarkInt\0\0\0\0\0\0")
 
 /**
  * @brief Login/Text Operational Session Text Key: IFMarkInt (obseleted).
@@ -4227,7 +4227,7 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * implementation MUST NOT respond with a "NotUnderstood" value for
  * either of these keys.
  */
-#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_IF_MARK_INT "IFMarkInt\0\0\0\0\0\0"
+#define ISCSI_LOGIN_AUTH_SESSION_TEXT_KEY_IF_MARK_INT ((const uint8_t *) "IFMarkInt\0\0\0\0\0\0")
 
 
 /// Login request Next Stage (NSG) flags: SecurityNegotiation.
@@ -5763,7 +5763,7 @@ int iscsi_validate_packet(const struct iscsi_bhs_packet *packet_data, const uint
  */
 typedef struct iscsi_key_value_pair_lut_entry {
     /// Name of key.
-    uint8_t *key;
+    const uint8_t *key;
 
     /// Default value of the key, always in string representation.
     uint8_t *value;
@@ -6220,6 +6220,19 @@ typedef struct iscsi_auth_chap {
 } iscsi_auth_chap;
 
 
+/// iSCSI session flags: Initial ready to transfer.
+#define ISCSI_SESSION_FLAGS_INIT_R2T          (1 << 0L)
+
+/// iSCSI session flags: Immediate data.
+#define ISCSI_SESSION_FLAGS_IMMEDIATE_DATA    (1 << 1L)
+
+/// iSCSI session flags: Data PDU in order.
+#define ISCSI_SESSION_FLAGS_DATA_PDU_IN_ORDER (1 << 2L)
+
+/// iSCSI session flags: Data sequence in order.
+#define ISCSI_SESSION_FLAGS_DATA_SEQ_IN_ORDER (1 << 3L)
+
+
 /// iSCSI session: Default maximum number of connections.
 #define ISCSI_SESSION_DEFAULT_MAX_CONNECTIONS     2UL
 
@@ -6238,18 +6251,6 @@ typedef struct iscsi_auth_chap {
 /// iSCSI session: Maximum burst length in bytes.
 #define ISCSI_SESSION_DEFAULT_MAX_BURST_LEN       (ISCSI_DEFAULT_MAX_RECV_DS_LEN * ISCSI_DEFAULT_MAX_DATA_OUT_PER_CONNECTION)
 
-/// iSCSI session: Default initial ready to transfer state.
-#define ISCSI_SESSION_DEFAULT_INIT_R2T            true
-
-/// iSCSI session: Default immediate data state.
-#define ISCSI_SESSION_DEFAULT_IMMEDIATE_DATA      true
-
-/// iSCSI session: Default data PDU in order state.
-#define ISCSI_SESSION_DEFAULT_DATA_PDU_IN_ORDER   true
-
-/// iSCSI session: Default data sequence in order state.
-#define ISCSI_SESSION_DEFAULT_DATA_SEQ_IN_ORDER   true
-
 /// iSCSI session: Default error recovery level.
 #define ISCSI_SESSION_DEFAULT_ERR_RECOVERY_LEVEL  0L
 
@@ -6281,6 +6282,9 @@ typedef struct iscsi_session {
     /// Login key / value pairs negotiated with this session.
     iscsi_hashmap *key_value_pairs;
 
+    /// Flags (extracted from key and value pairs).
+    int flags;
+
     /// Portal group tag.
     int tag;
 
@@ -6317,18 +6321,6 @@ typedef struct iscsi_session {
     /// Maximum burst length.
     uint max_burst_len;
 
-    /// Initial ready to transfer bit.
-    int init_r2t;
-
-    /// Immediate data bit.
-    int immediate_data;
-
-    /// Data PDU in order bit.
-    int data_pdu_in_order;
-
-    /// Data sequence in order bit.
-    int data_seq_in_order;
-
     /// Error recovery level.
     uint err_recovery_level;
 
@@ -6574,9 +6566,6 @@ typedef struct iscsi_pdu {
     /// Data digest (CRC32C) packet data for fast access and is straight after BHS, AHS, header digest and DataSegment packet in memory.
     iscsi_data_digest *data_digest;
 
-    /// Key and value pairs to send to client.
-    iscsi_hashmap *key_value_pairs;
-
     /// iSCSI task handling this PDU.
     struct iscsi_task *task;