From: Marcin Niestroj <m.niestroj@grinn-global.com>
To: barebox@lists.infradead.org
Cc: Marcin Niestroj <m.niestroj@grinn-global.com>
Subject: [PATCH] net: dhcp: fix option 54
Date: Tue, 23 Oct 2018 15:15:31 +0200 [thread overview]
Message-ID: <20181023131531.22804-1-m.niestroj@grinn-global.com> (raw)
Option 54 (Server Identifier) is something different than
SIADDR (Server IP address). Currently they are used
interchangeably. This causes DHCPNAK with DHCP servers that
have configured different values for each field.
Create new 'dhcp_serverip' field in 'struct dhcp_result', so we treat
option 54 separately. This fixes DHCP requests for servers that send
two different values for SIADDR and option 54 in DHCPOFFER.
Fixes: 528298b702a0 ("net: dhcp: rework")
Fixes: e18cc5b7e9ce ("DHCP: fix option 54 passing")
Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
---
include/dhcp.h | 1 +
net/dhcp.c | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/dhcp.h b/include/dhcp.h
index ce5ed61c6..0dced8e9f 100644
--- a/include/dhcp.h
+++ b/include/dhcp.h
@@ -28,6 +28,7 @@ struct dhcp_result {
IPaddr_t gateway;
IPaddr_t nameserver;
IPaddr_t serverip;
+ IPaddr_t dhcp_serverip;
char *hostname;
char *domainname;
char *rootpath;
diff --git a/net/dhcp.c b/net/dhcp.c
index 427d80a5a..79aa75d87 100644
--- a/net/dhcp.c
+++ b/net/dhcp.c
@@ -300,7 +300,7 @@ static void dhcp_options_handle(unsigned char option, void *popt,
net_copy_uint32(&dhcp_result->leasetime, popt);
break;
case 54:
- dhcp_result->serverip = net_read_ip(popt);
+ dhcp_result->dhcp_serverip = net_read_ip(popt);
break;
case 66:
dhcp_result->tftp_server_name = xstrndup(popt, optlen);
@@ -378,8 +378,8 @@ static void dhcp_send_request_packet(struct bootp *bp_offer)
/*
* Copy options from OFFER packet if present
*/
- extlen = dhcp_extended(bp->bp_vend, DHCP_REQUEST, dhcp_result->serverip,
- dhcp_result->ip);
+ extlen = dhcp_extended(bp->bp_vend, DHCP_REQUEST,
+ dhcp_result->dhcp_serverip, dhcp_result->ip);
debug("Transmitting DHCPREQUEST packet\n");
net_udp_send(dhcp_con, sizeof(*bp) + extlen);
--
2.19.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2018-10-23 13:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-23 13:15 Marcin Niestroj [this message]
2018-10-26 9:44 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181023131531.22804-1-m.niestroj@grinn-global.com \
--to=m.niestroj@grinn-global.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox