diff options
| author | Yegor Yefremov <yegorslists@googlemail.com> | 2018-02-20 08:47:50 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-02-22 08:17:20 +0100 |
| commit | e18cc5b7e9ce0ac71f0e00f166ca2e2afcc3f466 (patch) | |
| tree | faf0856a463096db22dac1fa11adbbd1796e25d5 | |
| parent | ea096f2fa7ac14ddfacf9e82af7f073d77cbd06c (diff) | |
| download | barebox-e18cc5b7e9ce0ac71f0e00f166ca2e2afcc3f466.tar.gz barebox-e18cc5b7e9ce0ac71f0e00f166ca2e2afcc3f466.tar.xz | |
DHCP: fix option 54 passing
Though variable net_dhcp_server_ip was declared and used as a
function parameter it was never assigned. That's why a DHCP
request was sent without option 54 set. Some DHCP server for
example dnsmasq didn't accept such a packet.
As both offered IP address and server IP are stored in the global
dhcp_result structure we don't need either net_dhcp_server_ip or
OfferedIP variables and can use the addresses from dhcp_result
directly.
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | net/dhcp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/dhcp.c b/net/dhcp.c index 946efaa1bf..d30551d8f3 100644 --- a/net/dhcp.c +++ b/net/dhcp.c @@ -76,7 +76,6 @@ typedef enum { static uint32_t Bootp_id; static dhcp_state_t dhcp_state; -static IPaddr_t net_dhcp_server_ip; static uint64_t dhcp_start; static struct eth_device *dhcp_edev; struct dhcp_req_param dhcp_param; @@ -350,7 +349,6 @@ static void dhcp_send_request_packet(struct bootp *bp_offer) { struct bootp *bp; int extlen; - IPaddr_t OfferedIP; debug("%s: Sending DHCPREQUEST\n", __func__); @@ -378,9 +376,8 @@ static void dhcp_send_request_packet(struct bootp *bp_offer) /* * Copy options from OFFER packet if present */ - net_copy_ip(&OfferedIP, &bp_offer->bp_yiaddr); - extlen = dhcp_extended(bp->bp_vend, DHCP_REQUEST, net_dhcp_server_ip, - OfferedIP); + extlen = dhcp_extended(bp->bp_vend, DHCP_REQUEST, dhcp_result->serverip, + dhcp_result->ip); debug("Transmitting DHCPREQUEST packet\n"); net_udp_send(dhcp_con, sizeof(*bp) + extlen); |