Add iSCSI to the DHCP tests.

[people/dverkamp/gpxe.git] / src / tests / dhcptest.c

diff --git a/src/tests/dhcptest.c b/src/tests/dhcptest.c
index b61535f..a4e8d10 100644 (file)
--- a/src/tests/dhcptest.c
+++ b/src/tests/dhcptest.c
@@ -3,12 +3,55 @@
 #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;
        struct in_addr address = { htonl ( 0 ) };
        struct in_addr netmask = { htonl ( 0 ) };
        struct in_addr gateway = { INADDR_NONE };
+       char filename[256];
        int rc;
 
        /* Bring IP interface up with address 0.0.0.0 */
@@ -17,15 +60,35 @@ int test_dhcp ( struct net_device *netdev ) {
                goto out_no_del_ipv4;
 
        /* Issue DHCP request */
+       printf ( "DHCP..." );
        memset ( &dhcp, 0, sizeof ( dhcp ) );
        dhcp.netdev = netdev;
-       if ( ( rc = async_wait ( start_dhcp ( &dhcp ) ) ) != 0 )
+       if ( ( rc = async_wait ( start_dhcp ( &dhcp ) ) ) != 0 ) {
+               printf ( "failed\n" );
                goto out_no_options;
+       }
+       printf ( "done\n" );
+
+       /* Register options received via DHCP */
+       register_dhcp_options ( dhcp.options );
 
        /* Retrieve IP address configuration */
-       find_dhcp_ipv4_option ( dhcp.options, DHCP_EB_YIADDR, &address );
-       find_dhcp_ipv4_option ( dhcp.options, DHCP_SUBNET_MASK, &netmask );
-       find_dhcp_ipv4_option ( dhcp.options, DHCP_ROUTERS, &gateway );
+       find_global_dhcp_ipv4_option ( DHCP_EB_YIADDR, &address );
+       find_global_dhcp_ipv4_option ( DHCP_SUBNET_MASK, &netmask );
+       find_global_dhcp_ipv4_option ( DHCP_ROUTERS, &gateway );
+
+       printf ( "IP %s", inet_ntoa ( address ) );
+       printf ( " netmask %s", inet_ntoa ( netmask ) );
+       printf ( " gateway %s\n", inet_ntoa ( gateway ) );
+
+       dhcp_snprintf ( filename, sizeof ( filename ),
+                       find_global_dhcp_option ( DHCP_BOOTFILE_NAME ) );
+       if ( ! filename[0] ) {
+               printf ( "No filename specified!\n" );
+               goto out;
+       }
+       
+       printf ( "Bootfile name %s\n", filename );
 
        /* Remove old IP address configuration */
        del_ipv4_address ( netdev );
@@ -35,11 +98,15 @@ int test_dhcp ( struct net_device *netdev ) {
                                       gateway ) ) != 0 )
                goto out_no_del_ipv4;
 
-       printf ( "IP %s", inet_ntoa ( address ) );
-       printf ( " netmask %s", inet_ntoa ( netmask ) );
-       printf ( " gateway %s\n", inet_ntoa ( gateway ) );
-
-       /* Free DHCP options */
+       /* Test boot */
+       if ( ( rc = test_dhcp_boot ( netdev, filename ) ) != 0 ) {
+               printf ( "Boot failed\n" );
+               goto out;
+       }
+       
+ out:
+       /* Unregister and free DHCP options */
+       unregister_dhcp_options ( dhcp.options );
        free_dhcp_options ( dhcp.options );
  out_no_options:
        /* Take down IP interface */