Create "username" and "password" DHCP options, ready for placing this

information in NVS.

diff --git a/src/include/gpxe/dhcp.h b/src/include/gpxe/dhcp.h
index 79df5fc7c9bc2f3545a4a4ea65ab262fd248f3c1..5b01c9ad8b973dad9cd776b10678a04687ecc77f 100644 (file)
--- a/src/include/gpxe/dhcp.h
+++ b/src/include/gpxe/dhcp.h
@@ -167,6 +167,24 @@
  */
 #define DHCP_EB_BIOS_DRIVE DHCP_ENCAP_OPT ( DHCP_EB_ENCAP, 0xbd )
 
+/** Username
+ *
+ * This will be used as the username for any required authentication.
+ * It is expected that this option's value will be held in
+ * non-volatile storage, rather than transmitted as part of a DHCP
+ * packet.
+ */
+#define DHCP_EB_USERNAME DHCP_ENCAP_OPT ( DHCP_EB_ENCAP, 0xbe )
+
+/** Password
+ *
+ * This will be used as the password for any required authentication.
+ * It is expected that this option's value will be held in
+ * non-volatile storage, rather than transmitted as part of a DHCP
+ * packet.
+ */
+#define DHCP_EB_PASSWORD DHCP_ENCAP_OPT ( DHCP_EB_ENCAP, 0xbf )
+
 /** Maximum normal DHCP option */
 #define DHCP_MAX_OPTION 254
 

diff --git a/src/tests/dhcptest.c b/src/tests/dhcptest.c
index be219b205b583b061604a9114e28917715fc2e48..a6e3ff80219532f2e72a3146a071839d37fd9e47 100644 (file)
--- a/src/tests/dhcptest.c
+++ b/src/tests/dhcptest.c
@@ -16,8 +16,8 @@ static int test_dhcp_aoe_boot ( struct net_device *netdev,
 
 static int test_dhcp_iscsi_boot ( struct net_device *netdev, char *iscsiname ) {
        char *initiator_iqn = "iqn.1900-01.localdomain.localhost:initiator";
-       char *username = "joe";
-       char *password = "secret";
+       char username[32];
+       char password[32];
        char *target_iqn;
        union {
                struct sockaddr_in sin;
@@ -35,6 +35,11 @@ static int test_dhcp_iscsi_boot ( struct net_device *netdev, char *iscsiname ) {
        }
        inet_aton ( iscsiname, &target.sin.sin_addr );
 
+       dhcp_snprintf ( username, sizeof ( username ),
+                       find_global_dhcp_option ( DHCP_EB_USERNAME ) );
+       dhcp_snprintf ( password, sizeof ( password ),
+                       find_global_dhcp_option ( DHCP_EB_PASSWORD ) );
+
        return test_iscsiboot ( initiator_iqn, &target.st, target_iqn,
                                username, password, netdev );
 }