From 9e9cc8c60ff573e02615889a4b7fa469c42fe425 Mon Sep 17 00:00:00 2001 From: Joshua Oreman Date: Tue, 8 Dec 2009 03:48:15 -0500 Subject: [pxe] Support cached DHCP packets in .kkpxe images If we don't unload the PXE stack before executing gPXE, automatically take advantage of the cached DHCPACK that the underlying/parent PXE stack can provide. If that cached DHCPACK contains option 175.178, or the user sets the use-cached setting before invoking DHCP, the real DHCP request will be skipped and the cached DHCPACK will be used for network configuration. Otherwise, the cached settings block is thrown away as soon as a fresh one is acquired. Signed-off-by: Marty Connor --- src/arch/i386/interface/pxeparent/pxeparent_dhcp.c | 69 ++++++++++++++++++++++ src/arch/i386/prefix/kkpxeprefix.S | 3 + 2 files changed, 72 insertions(+) create mode 100644 src/arch/i386/interface/pxeparent/pxeparent_dhcp.c diff --git a/src/arch/i386/interface/pxeparent/pxeparent_dhcp.c b/src/arch/i386/interface/pxeparent/pxeparent_dhcp.c new file mode 100644 index 00000000..66059437 --- /dev/null +++ b/src/arch/i386/interface/pxeparent/pxeparent_dhcp.c @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2009 Joshua Oreman . + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +FILE_LICENCE ( GPL2_OR_LATER ); + +#include +#include +#include +#include +#include +#include +#include + +/** + * Present cached DHCP packet if it exists + */ +void __weak_impl ( get_cached_dhcpack ) ( void ) { + struct undi_device *undi; + struct s_PXENV_GET_CACHED_INFO get_cached_info; + int rc; + + /* Use preloaded UNDI device to get at PXE entry point */ + undi = &preloaded_undi; + if ( ! undi->entry.segment ) { + DBG ( "PXEDHCP no preloaded UNDI device found\n" ); + return; + } + + /* Check that stack is available to get cached info */ + if ( ! ( undi->flags & UNDI_FL_KEEP_ALL ) ) { + DBG ( "PXEDHCP stack was unloaded, no cache available\n" ); + return; + } + + /* Obtain cached DHCP packet */ + memset ( &get_cached_info, 0, sizeof ( get_cached_info ) ); + get_cached_info.PacketType = PXENV_PACKET_TYPE_DHCP_ACK; + + if ( ( rc = pxeparent_call ( undi->entry, PXENV_GET_CACHED_INFO, + &get_cached_info, + sizeof ( get_cached_info ) ) ) != 0 ) { + DBG ( "PXEDHCP GET_CACHED_INFO failed: %s\n", strerror ( rc ) ); + return; + } + + DBG ( "PXEDHCP got cached info at %04x:%04x length %d\n", + get_cached_info.Buffer.segment, get_cached_info.Buffer.offset, + get_cached_info.BufferSize ); + + /* Present cached DHCP packet */ + store_cached_dhcpack ( real_to_user ( get_cached_info.Buffer.segment, + get_cached_info.Buffer.offset ), + get_cached_info.BufferSize ); +} diff --git a/src/arch/i386/prefix/kkpxeprefix.S b/src/arch/i386/prefix/kkpxeprefix.S index 4d13f404..02cc6fee 100644 --- a/src/arch/i386/prefix/kkpxeprefix.S +++ b/src/arch/i386/prefix/kkpxeprefix.S @@ -5,6 +5,9 @@ FILE_LICENCE ( GPL2_OR_LATER ) +/* Since we have the whole stack, we can use cached DHCP information */ +REQUEST_OBJECT ( pxeparent_dhcp ) + #define PXELOADER_KEEP_UNDI #define PXELOADER_KEEP_PXE #include "pxeprefix.S" -- cgit v1.2.3-55-g7522