blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 09:39:10 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/netif_ppp_server_negotiate_own_addr' into 'master'

Browse Source 
fix(esp_netif): Fix PPP server to negotiate its own address is configured

Closes IDFGH-12759

See merge request espressif/esp-idf!30810
This commit is contained in:
David Čermák 2024-06-05 15:54:02 +08:00
commit 4e5c837b5d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/esp_netif/lwip/esp_netif_lwip_ppp.c
View File

@ -165,7 +165,7 @@ static void on_ppp_notify_phase(ppp_pcb *pcb, u8_t phase, void *ctx)
#endif // PPP_NOTIFY_PHASE
/**
* @brief PPP low level output callback used to transmit data using standard esp-netif interafce
* @brief PPP low level output callback used to transmit data using standard esp-netif interface
*
* @param pcb PPP control block
* @param data Buffer to write to serial port
@ -255,6 +255,10 @@ esp_err_t esp_netif_start_ppp(esp_netif_t *esp_netif)
// Set our preferred address, and accept the remote
ppp_ctx->ppp->ipcp_wantoptions.ouraddr = ppp_ctx->ppp_our_ip4_addr.addr;
ppp_ctx->ppp->ipcp_wantoptions.accept_remote = 1;
ppp_ctx->ppp->ask_for_local = 1; /* `ask_for_local` option in the lwip's pcb is `0` by default and causes
* the initial negotiation IPCP request to reset our own address to '0.0.0.0'.
* https://github.com/lwip-tcpip/lwip/blob/1cc1536e/src/netif/ppp/ipcp.c#L728-L729
*/
}
if (ppp_ctx->ppp_their_ip4_addr.addr != IPADDR_ANY) {
// Set their preferred address, and accept the local