Skip to content

Commit

Permalink
Merge branch 'bugfix/lwip_dhcps_hook_types' into 'master'
Browse files Browse the repository at this point in the history
lwip: Fix incorrect invocation of the hook `LWIP_HOOK_DHCPS_POST_APPEND_OPTS`

Closes IDFGH-10099 and IDFGH-10098

See merge request espressif/esp-idf!23793
  • Loading branch information
david-cermak committed Jun 12, 2023
2 parents 6d60dd9 + 97c44ee commit fd8ed0d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions components/lwip/apps/dhcpserver/dhcpserver.c
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ static void send_offer(dhcps_t *dhcps, struct dhcps_msg *m, u16_t len)

end = add_msg_type(&m->options[4], DHCPOFFER);
end = add_offer_options(dhcps, end);
LWIP_HOOK_DHCPS_POST_APPEND_OPTS(dhcps->netif, dhcps, DHCPOFFER, &end)
LWIP_HOOK_DHCPS_POST_APPEND_OPTS(dhcps->dhcps_netif, dhcps, DHCPOFFER, &end)
end = add_end(end);

p = dhcps_pbuf_alloc(len);
Expand Down Expand Up @@ -637,7 +637,7 @@ static void send_nak(dhcps_t *dhcps, struct dhcps_msg *m, u16_t len)
create_msg(dhcps, m);

end = add_msg_type(&m->options[4], DHCPNAK);
LWIP_HOOK_DHCPS_POST_APPEND_OPTS(dhcps->netif, dhcps, DHCPNAK, &end)
LWIP_HOOK_DHCPS_POST_APPEND_OPTS(dhcps->dhcps_netif, dhcps, DHCPNAK, &end)
end = add_end(end);

p = dhcps_pbuf_alloc(len);
Expand Down Expand Up @@ -714,7 +714,7 @@ static void send_ack(dhcps_t *dhcps, struct dhcps_msg *m, u16_t len)

end = add_msg_type(&m->options[4], DHCPACK);
end = add_offer_options(dhcps, end);
LWIP_HOOK_DHCPS_POST_APPEND_OPTS(dhcps->netif, dhcps, DHCPACK, &end)
LWIP_HOOK_DHCPS_POST_APPEND_OPTS(dhcps->dhcps_netif, dhcps, DHCPACK, &end)
end = add_end(end);

p = dhcps_pbuf_alloc(len);
Expand Down

0 comments on commit fd8ed0d

Please sign in to comment.