diff options
| author | Michael Brown | 2015-06-29 10:58:16 +0200 |
|---|---|---|
| committer | Michael Brown | 2015-06-29 11:18:39 +0200 |
| commit | edf74df4abf0b9ed92f399272b0491851ba1ffaa (patch) | |
| tree | cb80547d2cc004219c784224229fdb0007102af0 /src/arch/i386 | |
| parent | [dhcp] Defer discovery if link is blocked (diff) | |
| download | ipxe-edf74df4abf0b9ed92f399272b0491851ba1ffaa.tar.gz ipxe-edf74df4abf0b9ed92f399272b0491851ba1ffaa.tar.xz ipxe-edf74df4abf0b9ed92f399272b0491851ba1ffaa.zip | |
[pxe] Always reconstruct packet for PXENV_GET_CACHED_INFO
Avoid accidentally returning stale packets (e.g. for a previously
attempted network device) by always constructing a fresh DHCP packet.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch/i386')
| -rw-r--r-- | src/arch/i386/interface/pxe/pxe_preboot.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/arch/i386/interface/pxe/pxe_preboot.c b/src/arch/i386/interface/pxe/pxe_preboot.c index 7cb82f74..6e09080b 100644 --- a/src/arch/i386/interface/pxe/pxe_preboot.c +++ b/src/arch/i386/interface/pxe/pxe_preboot.c @@ -178,18 +178,16 @@ pxenv_get_cached_info ( struct s_PXENV_GET_CACHED_INFO *get_cached_info ) { } info = &cached_info[idx]; - /* Construct cached version of packet, if not already constructed. */ - if ( ! info->dhcphdr.op ) { - /* Construct DHCP packet */ - creator = &pxe_dhcp_packet_creators[idx]; - if ( ( rc = creator->create ( pxe_netdev, info, - sizeof ( *info ) ) ) != 0 ) { - DBGC ( &pxe_netdev, " failed to build packet: %s\n", - strerror ( rc ) ); - goto err; - } + /* Construct DHCP packet */ + creator = &pxe_dhcp_packet_creators[idx]; + if ( ( rc = creator->create ( pxe_netdev, info, + sizeof ( *info ) ) ) != 0 ) { + DBGC ( &pxe_netdev, " failed to build packet: %s\n", + strerror ( rc ) ); + goto err; } + /* Copy packet (if applicable) */ len = get_cached_info->BufferSize; if ( len == 0 ) { /* Point client at our cached buffer. |