narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Split login into security negotation and operational parameter 

negotiation phases, to allow inclusion of CHAP authentication.
pull/1/head
Michael Brown 2006-10-03 09:17:38 +00:00
parent b16de6ae66
commit fedc186fd7
2 changed files with 57 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/include/gpxe/iscsi.h
View File

@ -167,6 +167,13 @@ struct iscsi_bhs_login_request {
#define ISCSI_LOGIN_NSG_OPERATIONAL_NEGOTIATION 0x01 #define ISCSI_LOGIN_NSG_OPERATIONAL_NEGOTIATION 0x01
#define ISCSI_LOGIN_NSG_FULL_FEATURE_PHASE 0x03 #define ISCSI_LOGIN_NSG_FULL_FEATURE_PHASE 0x03
/* Combined stage values and mask */
#define ISCSI_LOGIN_STAGE_MASK ( ISCSI_LOGIN_CSG_MASK | ISCSI_LOGIN_NSG_MASK )
#define ISCSI_LOGIN_STAGE_SEC ( ISCSI_LOGIN_CSG_SECURITY_NEGOTIATION | \
ISCSI_LOGIN_NSG_OPERATIONAL_NEGOTIATION )
#define ISCSI_LOGIN_STAGE_OP ( ISCSI_LOGIN_CSG_OPERATIONAL_NEGOTIATION | \
ISCSI_LOGIN_NSG_FULL_FEATURE_PHASE )
/** ISID IANA format marker */ /** ISID IANA format marker */
#define ISCSI_ISID_IANA 0x40000000 #define ISCSI_ISID_IANA 0x40000000

49
src/net/tcp/iscsi.c
View File

@ -291,10 +291,20 @@ static void iscsi_tx_data_out ( struct iscsi_session *iscsi,
*/ */
static int iscsi_build_login_request_strings ( struct iscsi_session *iscsi, static int iscsi_build_login_request_strings ( struct iscsi_session *iscsi,
void *data, size_t len ) { void *data, size_t len ) {
struct iscsi_bhs_login_request *request = &iscsi->tx_bhs.login_request;
switch ( request->flags & ISCSI_LOGIN_CSG_MASK ) {
case ISCSI_LOGIN_CSG_SECURITY_NEGOTIATION:
return snprintf ( data, len, return snprintf ( data, len,
"InitiatorName=%s%c" "InitiatorName=%s%c"
"TargetName=%s%c" "TargetName=%s%c"
"SessionType=Normal%c" "SessionType=Normal%c"
"AuthMethod=CHAP,None%c"
"CHAP_A=5%c",
iscsi->initiator, 0, iscsi->target, 0,
0, 0, 0 );
case ISCSI_LOGIN_CSG_OPERATIONAL_NEGOTIATION:
return snprintf ( data, len,
"HeaderDigest=None%c" "HeaderDigest=None%c"
"DataDigest=None%c" "DataDigest=None%c"
"InitialR2T=Yes%c" "InitialR2T=Yes%c"
@ -304,17 +314,22 @@ static int iscsi_build_login_request_strings ( struct iscsi_session *iscsi,
"DataPDUInOrder=Yes%c" "DataPDUInOrder=Yes%c"
"DataSequenceInOrder=Yes%c" "DataSequenceInOrder=Yes%c"
"ErrorRecoveryLevel=0%c", "ErrorRecoveryLevel=0%c",
iscsi->initiator, 0, iscsi->target, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );
0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); default:
assert ( 0 );
return 0;
}
} }
/** /**
* Build iSCSI login request BHS * Build iSCSI login request BHS
* *
* @v iscsi iSCSI session * @v iscsi iSCSI session
* @v first Login request is the first in a sequence * @v stage Current stage of iSCSI login
* @v send_strings Send login strings with this login request
*/ */
static void iscsi_start_login ( struct iscsi_session *iscsi, int first ) { static void iscsi_start_login ( struct iscsi_session *iscsi,
int stage, int send_strings ) {
struct iscsi_bhs_login_request *request = &iscsi->tx_bhs.login_request; struct iscsi_bhs_login_request *request = &iscsi->tx_bhs.login_request;
int len; int len;
@ -322,11 +337,10 @@ static void iscsi_start_login ( struct iscsi_session *iscsi, int first ) {
iscsi_start_tx ( iscsi ); iscsi_start_tx ( iscsi );
request->opcode = ( ISCSI_OPCODE_LOGIN_REQUEST | request->opcode = ( ISCSI_OPCODE_LOGIN_REQUEST |
ISCSI_FLAG_IMMEDIATE ); ISCSI_FLAG_IMMEDIATE );
request->flags = ( ISCSI_LOGIN_FLAG_TRANSITION | request->flags = ( ISCSI_LOGIN_FLAG_TRANSITION | stage );
ISCSI_LOGIN_CSG_OPERATIONAL_NEGOTIATION |
ISCSI_LOGIN_NSG_FULL_FEATURE_PHASE );
/* version_max and version_min left as zero */ /* version_max and version_min left as zero */
if ( first ) { if ( send_strings ) {
len = iscsi_build_login_request_strings ( iscsi, NULL, 0 ); len = iscsi_build_login_request_strings ( iscsi, NULL, 0 );
ISCSI_SET_LENGTHS ( request->lengths, 0, len ); ISCSI_SET_LENGTHS ( request->lengths, 0, len );
} }
@ -334,8 +348,6 @@ static void iscsi_start_login ( struct iscsi_session *iscsi, int first ) {
IANA_EN_FEN_SYSTEMS ); IANA_EN_FEN_SYSTEMS );
/* isid_iana_qual left as zero */ /* isid_iana_qual left as zero */
request->tsih = htons ( iscsi->tsih ); request->tsih = htons ( iscsi->tsih );
if ( first )
iscsi->itt++;
request->itt = htonl ( iscsi->itt ); request->itt = htonl ( iscsi->itt );
/* cid left as zero */ /* cid left as zero */
request->cmdsn = htonl ( iscsi->cmdsn ); request->cmdsn = htonl ( iscsi->cmdsn );
@ -387,7 +399,17 @@ static void iscsi_rx_login_response ( struct iscsi_session *iscsi,
* request without any login strings. * request without any login strings.
*/ */
if ( ! ( response->flags & ISCSI_LOGIN_FLAG_TRANSITION ) ) { if ( ! ( response->flags & ISCSI_LOGIN_FLAG_TRANSITION ) ) {
iscsi_start_login ( iscsi, 0 ); iscsi_start_login ( iscsi, ( response->flags &
ISCSI_LOGIN_STAGE_MASK ), 0 );
return;
}
/* If we are transitioning to the operational phase, send the
* operational phase login request.
*/
if ( ( response->flags & ISCSI_LOGIN_NSG_MASK ) ==
ISCSI_LOGIN_NSG_OPERATIONAL_NEGOTIATION ) {
iscsi_start_login ( iscsi, ISCSI_LOGIN_STAGE_OP, 1 );
return; return;
} }
@ -762,8 +784,11 @@ static void iscsi_connected ( struct tcp_connection *conn ) {
iscsi->rx_state = ISCSI_RX_BHS; iscsi->rx_state = ISCSI_RX_BHS;
iscsi->rx_offset = 0; iscsi->rx_offset = 0;
/* Assign fresh initiator task tag */
iscsi->itt++;
/* Start logging in */ /* Start logging in */
iscsi_start_login ( iscsi, 1 ); iscsi_start_login ( iscsi, ISCSI_LOGIN_STAGE_SEC, 1 );
} }
/** iSCSI TCP operations */ /** iSCSI TCP operations */