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

Cannot immediately overwrite the peer address when we parse 

TargetAddress from the login response, because we still need the old
address while we close the connection!
pull/1/head
Michael Brown 2006-12-22 12:24:12 +00:00
parent 73e3e02367
commit a2e3357825
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -504,9 +504,15 @@ struct iscsi_session {
int retry_count; int retry_count;
/** Initiator IQN */ /** Initiator IQN */
const char *initiator; const char *initiator_iqn;
/** Target address
*
* Kept separate from the TCP connection structure because we
* may need to handle login redirection.
*/
struct sockaddr_tcpip target;
/** Target IQN */ /** Target IQN */
const char *target; const char *target_iqn;
/** Logical Unit Number (LUN) */ /** Logical Unit Number (LUN) */
uint64_t lun; uint64_t lun;

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

@ -395,8 +395,8 @@ static int iscsi_build_login_request_strings ( struct iscsi_session *iscsi,
"TargetName=%s%c" "TargetName=%s%c"
"SessionType=Normal%c" "SessionType=Normal%c"
"AuthMethod=CHAP,None%c", "AuthMethod=CHAP,None%c",
iscsi->initiator, 0, iscsi->target, 0, iscsi->initiator_iqn, 0,
0, 0 ); iscsi->target_iqn, 0, 0, 0 );
} }
if ( iscsi->status & ISCSI_STATUS_STRINGS_CHAP_ALGORITHM ) { if ( iscsi->status & ISCSI_STATUS_STRINGS_CHAP_ALGORITHM ) {
@ -497,7 +497,7 @@ static void iscsi_tx_login_request ( struct iscsi_session *iscsi,
static void iscsi_handle_targetaddress_value ( struct iscsi_session *iscsi, static void iscsi_handle_targetaddress_value ( struct iscsi_session *iscsi,
const char *value ) { const char *value ) {
struct in_addr address; struct in_addr address;
struct sockaddr_in *sin = ( struct sockaddr_in * ) &iscsi->tcp.peer; struct sockaddr_in *sin = ( struct sockaddr_in * ) &iscsi->target;
if ( inet_aton ( value, &address ) == 0 ) { if ( inet_aton ( value, &address ) == 0 ) {
DBG ( "iSCSI %p received invalid TargetAddress \"%s\"\n", DBG ( "iSCSI %p received invalid TargetAddress \"%s\"\n",
@ -1121,6 +1121,9 @@ static void iscsi_closed ( struct tcp_connection *conn, int status ) {
/* Retry connection if within the retry limit, otherwise fail */ /* Retry connection if within the retry limit, otherwise fail */
if ( ++iscsi->retry_count <= ISCSI_MAX_RETRIES ) { if ( ++iscsi->retry_count <= ISCSI_MAX_RETRIES ) {
DBG ( "iSCSI %p retrying connection\n", iscsi ); DBG ( "iSCSI %p retrying connection\n", iscsi );
/* Re-copy address to handle redirection */
memcpy ( &iscsi->tcp.peer, &iscsi->target,
sizeof ( iscsi->tcp.peer ) );
tcp_connect ( conn ); tcp_connect ( conn );
} else { } else {
printf ( "iSCSI %p retry count exceeded\n", iscsi ); printf ( "iSCSI %p retry count exceeded\n", iscsi );
@ -1190,6 +1193,8 @@ struct async_operation * iscsi_issue ( struct iscsi_session *iscsi,
} else { } else {
/* Session not open: initiate login */ /* Session not open: initiate login */
iscsi->tcp.tcp_op = &iscsi_tcp_operations; iscsi->tcp.tcp_op = &iscsi_tcp_operations;
memcpy ( &iscsi->tcp.peer, &iscsi->target,
sizeof ( iscsi->tcp.peer ) );
tcp_connect ( &iscsi->tcp ); tcp_connect ( &iscsi->tcp );
} }

8
src/tests/iscsiboot.c
View File

@ -21,10 +21,10 @@ int test_iscsiboot ( const char *initiator_iqn,
int rc; int rc;
memset ( &test_iscsidev, 0, sizeof ( test_iscsidev ) ); memset ( &test_iscsidev, 0, sizeof ( test_iscsidev ) );
memcpy ( &test_iscsidev.iscsi.tcp.peer, target, memcpy ( &test_iscsidev.iscsi.target, target,
sizeof ( test_iscsidev.iscsi.tcp.peer ) ); sizeof ( test_iscsidev.iscsi.target ) );
test_iscsidev.iscsi.initiator = initiator_iqn; test_iscsidev.iscsi.initiator_iqn = initiator_iqn;
test_iscsidev.iscsi.target = target_iqn; test_iscsidev.iscsi.target_iqn = target_iqn;
test_iscsidev.iscsi.lun = lun; test_iscsidev.iscsi.lun = lun;
test_iscsidev.iscsi.username = username; test_iscsidev.iscsi.username = username;
test_iscsidev.iscsi.password = password; test_iscsidev.iscsi.password = password;