From d6620f0f3af60ba1be8c5df795c29dcddcd2698e Mon Sep 17 00:00:00 2001 From: sg Date: Fri, 20 Mar 2015 20:29:04 +0100 Subject: [PATCH] fixed bug #38203 (DHCP options are not recorded in all DHCP ack messages) --- CHANGELOG | 3 +++ src/core/dhcp.c | 1 + 2 files changed, 4 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b1189e4d..015fe980 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -216,6 +216,9 @@ HISTORY ++ Bugfixes: + 2015-03-19: Simon Goldschmidt + * dhcp.c: fixed bug #38203 (DHCP options are not recorded in all DHCP ack messages) + 2015-03-19: Simon Goldschmidt * api.h, tcpip.h, api_lib.c, api_msg.c: fixed race conditions in assigning netconn->last_err (fixed bugs #38121 and #37676) diff --git a/src/core/dhcp.c b/src/core/dhcp.c index 7596700c..23007da2 100644 --- a/src/core/dhcp.c +++ b/src/core/dhcp.c @@ -1641,6 +1641,7 @@ dhcp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr, } /* already bound to the given lease address? */ else if ((dhcp->state == DHCP_REBOOTING) || (dhcp->state == DHCP_REBINDING) || (dhcp->state == DHCP_RENEWING)) { + dhcp_handle_ack(netif); dhcp_bind(netif); } }