xCAT/xNBA
2
0
Fork 0
mirror of https://github.com/xcat2/xNBA.git synced 2025-01-11 10:17:49 +00:00
Code Issues Projects Releases Wiki Activity

Add iSCSI to the DHCP tests.

Browse Source 
Start updating iscsi.c to use Nikhil's TCP API.
This commit is contained in:
Michael Brown 2006-08-07 16:48:24 +00:00
parent 6714ec745a
commit d0e4f198d6
3 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -777,7 +777,7 @@ int iscsi_issue ( struct iscsi_session *iscsi,
if ( iscsi->status & ISCSI_STATUS_CONNECTED ) {
iscsi_start_command ( iscsi );
tcp_kick ( &iscsi->tcp );
tcp_senddata ( &iscsi->tcp );
} else {
iscsi->tcp.tcp_op = &iscsi_tcp_operations;
tcp_connect ( &iscsi->tcp );

56
src/tests/dhcptest.c
View File

@ -3,6 +3,48 @@
#include <byteswap.h>
#include <gpxe/ip.h>
#include <gpxe/dhcp.h>
#include <gpxe/iscsi.h>
static int test_dhcp_aoe_boot ( struct net_device *netdev,
char *aoename ) {
unsigned int drivenum;
drivenum = find_global_dhcp_num_option ( DHCP_EB_BIOS_DRIVE );
return test_aoeboot ( netdev, aoename, drivenum );
}
static int test_dhcp_iscsi_boot ( struct net_device *netdev __unused,
char *iscsiname ) {
char *initiator_iqn = "iqn.1900-01.localdomain.localhost:initiator";
char *target_iqn;
union {
struct sockaddr_in sin;
struct sockaddr_tcpip st;
} target;
memset ( &target, 0, sizeof ( target ) );
target.sin.sin_family = AF_INET;
target.sin.sin_port = htons ( ISCSI_PORT );
target_iqn = strchr ( iscsiname, ':' ) + 1;
if ( ! target_iqn ) {
printf ( "Invalid iSCSI DHCP path\n" );
return -EINVAL;
}
inet_aton ( iscsiname, &target.sin.sin_addr );
return test_iscsiboot ( initiator_iqn, &target, target_iqn );
}
static int test_dhcp_boot ( struct net_device *netdev, char *filename ) {
if ( strncmp ( filename, "aoe:", 4 ) == 0 ) {
return test_dhcp_aoe_boot ( netdev, &filename[4] );
} else if ( strncmp ( filename, "iscsi:", 6 ) == 0 ) {
return test_dhcp_iscsi_boot ( netdev, &filename[6] );
} else {
printf ( "Don't know how to boot %s\n", filename );
return -EPROTONOSUPPORT;
}
}
int test_dhcp ( struct net_device *netdev ) {
struct dhcp_session dhcp;
@ -56,16 +98,10 @@ int test_dhcp ( struct net_device *netdev ) {
gateway ) ) != 0 )
goto out_no_del_ipv4;
/* Proof of concept: check for "aoe:" prefix and if found, do
* test AoE boot with AoE options.
*/
if ( strncmp ( filename, "aoe:", 4 ) == 0 ) {
unsigned int drivenum;
drivenum = find_global_dhcp_num_option ( DHCP_EB_BIOS_DRIVE );
test_aoeboot ( netdev, &filename[4], drivenum );
} else {
printf ( "Don't know how to boot %s\n", filename );
/* Test boot */
if ( ( rc = test_dhcp_boot ( netdev, filename ) ) != 0 ) {
printf ( "Boot failed\n" );
goto out;
}
out:

7
src/tests/iscsiboot.c
View File

@ -8,14 +8,15 @@
static struct iscsi_device test_iscsidev;
int test_iscsiboot ( const char *initiator_iqn,
struct in_addr target,
struct sockaddr_tcpip *target,
const char *target_iqn ) {
struct sockaddr_in *sin;
struct int13_drive drive;
int rc;
memset ( &test_iscsidev, 0, sizeof ( test_iscsidev ) );
test_iscsidev.iscsi.tcp.sin.sin_addr = target;
test_iscsidev.iscsi.tcp.sin.sin_port = htons ( ISCSI_PORT );
memcpy ( &test_iscsidev.iscsi.tcp.peer, target,
sizeof ( test_iscsidev.iscsi.tcp.peer ) );
test_iscsidev.iscsi.initiator = initiator_iqn;
test_iscsidev.iscsi.target = target_iqn;