mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-25 00:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix using LWIP_HOOK_DHCP_PARSE_OPTION after recent dhcp changes

Browse Source
This commit is contained in:
goldsimon 2017-08-04 21:53:24 +02:00
parent cd80e38db8
commit a681f6b04f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/ipv4/dhcp.c
View File

@ -1495,7 +1495,7 @@ dhcp_option_hostname(u16_t options_out_len, u8_t *options, struct netif *netif)
* *
*/ */
static err_t static err_t
dhcp_parse_reply(struct pbuf *p) dhcp_parse_reply(struct pbuf *p, struct dhcp *dhcp)
{ {
u8_t *options; u8_t *options;
u16_t offset; u16_t offset;
@ -1507,6 +1507,8 @@ dhcp_parse_reply(struct pbuf *p)
int parse_sname_as_options = 0; int parse_sname_as_options = 0;
struct dhcp_msg *msg_in; struct dhcp_msg *msg_in;
LWIP_UNUSED_ARG(dhcp);
/* clear received options */ /* clear received options */
dhcp_clear_all_options(dhcp); dhcp_clear_all_options(dhcp);
/* check that beginning of dhcp_msg (up to and including chaddr) is in first pbuf */ /* check that beginning of dhcp_msg (up to and including chaddr) is in first pbuf */
@ -1783,7 +1785,7 @@ dhcp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr,
goto free_pbuf_and_return; goto free_pbuf_and_return;
} }
/* option fields could be unfold? */ /* option fields could be unfold? */
if (dhcp_parse_reply(p) != ERR_OK) { if (dhcp_parse_reply(p, dhcp) != ERR_OK) {
LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS,
("problem unfolding DHCP message - too short on memory?\n")); ("problem unfolding DHCP message - too short on memory?\n"));
goto free_pbuf_and_return; goto free_pbuf_and_return;