From 31def8459d8d3254041335122b929d4a27b24756 Mon Sep 17 00:00:00 2001 From: okuji Date: Thu, 20 May 2004 22:17:27 +0000 Subject: [PATCH] 2004-05-20 Damian Ivereigh * netboot/main.c: Fixed bootp only code so that options work properly. This fix is obvious when compared with the DHCP code. --- ChangeLog | 6 ++++++ THANKS | 1 + netboot/main.c | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2d6319368..c42bd08a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-05-20 Damian Ivereigh + + * netboot/main.c: Fixed bootp only code so that options + work properly. This fix is obvious when compared with the + DHCP code. + 2004-05-17 Pavel Roskin * stage2/char_io.c (safe_parse_maxint): Disable for stage 1.5. diff --git a/THANKS b/THANKS index f43fe1aca..040398358 100644 --- a/THANKS +++ b/THANKS @@ -25,6 +25,7 @@ Cedric Ware Chip Salzenberg Christian Jones Christoph Plattner +Damian Ivereigh Dan J. Walters Daniel Farrell Daniel Pittman diff --git a/netboot/main.c b/netboot/main.c index 140cbea31..82759b6cc 100644 --- a/netboot/main.c +++ b/netboot/main.c @@ -881,7 +881,8 @@ await_reply (int type, int ival, void *ptr, int timeout) + sizeof (struct udphdr))]; if (type == AWAIT_BOOTP #ifdef NO_DHCP_SUPPORT - && (nic.packetlen >= (ETH_HLEN + sizeof (struct bootp_t))) + && (nic.packetlen + >= (ETH_HLEN + sizeof (struct bootp_t) - BOOTP_VENDOR_LEN)) #else && (nic.packetlen >= (ETH_HLEN + sizeof (struct bootp_t) - DHCP_OPT_LEN))