From a9b63ecda55ea24df7d51d59cc7fd7b3234bc135 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 20 Mar 2013 00:54:42 +0000 Subject: [PATCH] [dhcp] Use PXE byte ordering for UUID in DHCP option 97 The PXE spec does not specify a byte ordering for UUIDs, but RFC4578 suggests that it follows the EFI spec, in which the first three fields are little-endian. Signed-off-by: Michael Brown --- src/net/udp/dhcp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c index e63c3e42..3f2c451e 100644 --- a/src/net/udp/dhcp.c +++ b/src/net/udp/dhcp.c @@ -1041,10 +1041,17 @@ int dhcp_create_request ( struct dhcp_packet *dhcppkt, return rc; } - /* Add client UUID, if we have one. Required for PXE. */ + /* Add client UUID, if we have one. Required for PXE. The + * PXE spec does not specify a byte ordering for UUIDs, but + * RFC4578 suggests that it follows the EFI spec, in which the + * first three fields are little-endian. + */ client_uuid.type = DHCP_CLIENT_UUID_TYPE; if ( ( len = fetch_uuid_setting ( NULL, &uuid_setting, &client_uuid.uuid ) ) >= 0 ) { + __bswap_32s ( &client_uuid.uuid.canonical.a ); + __bswap_16s ( &client_uuid.uuid.canonical.b ); + __bswap_16s ( &client_uuid.uuid.canonical.c ); if ( ( rc = dhcppkt_store ( dhcppkt, DHCP_CLIENT_UUID, &client_uuid, sizeof ( client_uuid ) ) ) != 0 ) {