diff options
-rw-r--r-- | include/dhcp.h | 1 | ||||
-rw-r--r-- | net/dhcp.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/dhcp.h b/include/dhcp.h index ce5ed61c65..0dced8e9fa 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 984d32a93e..f41d2dd305 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); |