mirror/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-02-28 18:04:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

[wifi] Track lwIP-internal DHCP+DNS UDP PCBs via socket consumer API

Browse Source 
Register the 2 UDP PCBs that lwIP allocates internally for DHCP and DNS
as a wifi.lwip_internal socket consumer, eliminating the magic +2 in
libretiny's MEMP_NUM_UDP_PCB calculation. Also corrects SDK default
values in the comparison table after line-by-line verification against
all three SDK source files.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
J. Nick Koston
2026-02-21 13:33:50 -06:00
parent 4114620aee
commit 38984b61c9
2 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
esphome/components/libretiny/__init__.py
View File

@@ -294,18 +294,19 @@ def _configure_lwip(config: dict) -> None:
MEM_SIZE 1.6KB N/A* 32KB 5KB N/A* 5KB BK
MAX_SOCKETS_TCP 5 16 12 —** —** dynamic
MAX_SOCKETS_UDP 4 16 22 —** —** dynamic
TCP_SND_QUEUELEN ~8 17 20 13 35 17
TCP_SND_QUEUELEN ~8 17 20 20 35 17
MEMP_NUM_TCP_SEG 10 16 40 20 =qlen 17
MEMP_NUM_TCP_PCB 5 16 12 10 8 =TCP
MEMP_NUM_UDP_PCB 4 16 24→7*** 6→7*** 4→7*** =UDP+2
MEMP_NUM_NETCONN 0 10 —**** —**** =sum =sum
MEMP_NUM_NETBUF 0 2 —**** —**** 8 4
MEMP_NUM_TCPIP_MSG_INPKT 4 8 —**** —**** 12 8
MEMP_NUM_UDP_PCB 4 16 25*** 7**** 7**** =UDP
MEMP_NUM_NETCONN 0 10 38 4***** =sum =sum
MEMP_NUM_NETBUF 0 2 16 2***** 8 4
MEMP_NUM_TCPIP_MSG_INPKT 4 8 16 8***** 12 8
* ESP32 and LN882H use MEM_LIBC_MALLOC=1 (system heap, no dedicated pool).
** RTL/LN SDKs don't define MAX_SOCKETS_TCP/UDP (LibreTiny-specific).
*** MEMP_NUM_UDP_PCB: SDK base values, all overridden to 7 by LT platform.
**** Not defined in SDK — lwIP opt.h defaults apply.
*** BK LT overlay: MAX_SOCKETS_UDP+2+1 = 25.
**** RTL/LN LT overlay overrides to flat 7.
***** Not defined in RTL SDK — lwIP opt.h defaults shown.
"dynamic" = auto-calculated from component socket registrations via
socket.get_socket_counts() with minimums of 10 TCP / 6 UDP.
"""
@@ -333,7 +334,7 @@ def _configure_lwip(config: dict) -> None:
# TCP_SND_QUEUELEN: max pbufs queued for send buffer
# ESP-IDF formula: (4 * TCP_SND_BUF + (TCP_MSS - 1)) / TCP_MSS
# With 4×MSS: (4*5840 + 1459) / 1460 = 17 — match ESP32
tcp_snd_queuelen = 17 # BK: 20, RTL: 13, LN: 35
tcp_snd_queuelen = 17 # BK: 20, RTL: 20, LN: 35
# MEMP_NUM_TCP_SEG: segment pool, must be >= TCP_SND_QUEUELEN (lwIP sanity check)
memp_num_tcp_seg = tcp_snd_queuelen # BK: 40, RTL: 20, LN: =qlen
@@ -356,14 +357,14 @@ def _configure_lwip(config: dict) -> None:
f"MEMP_NUM_TCP_SEG={memp_num_tcp_seg}", # must be >= queuelen
# PCB pools — 1:1 with socket counts
f"MEMP_NUM_TCP_PCB={tcp_sockets}", # BK: 12, RTL: 10, LN: 8
# UDP PCB pool — +2 for lwIP internal use (DHCP, DNS)
f"MEMP_NUM_UDP_PCB={udp_sockets + 2}", # all SDKs →7 via LT
# UDP PCB pool — includes wifi.lwip_internal (DHCP + DNS)
f"MEMP_NUM_UDP_PCB={udp_sockets}", # BK: 25, RTL/LN: 7 via LT
# Netconn pool — sum of all socket types
f"MEMP_NUM_NETCONN={tcp_sockets + listening_tcp + udp_sockets}",
# Netbuf pool
"MEMP_NUM_NETBUF=4", # BK/RTL: lwIP default(2), LN: 8
"MEMP_NUM_NETBUF=4", # BK: 16, RTL: 2 (opt.h), LN: 8
# Inbound message pool
"MEMP_NUM_TCPIP_MSG_INPKT=8", # BK/RTL: lwIP default(8), LN: 12
"MEMP_NUM_TCPIP_MSG_INPKT=8", # BK: 16, RTL: 8 (opt.h), LN: 12
]
# MEM_SIZE: lwIP dedicated heap pool.

12
esphome/components/wifi/__init__.py
View File

@@ -58,6 +58,7 @@ from esphome.const import (
)
from esphome.core import CORE, CoroPriority, HexInt, coroutine_with_priority
import esphome.final_validate as fv
from esphome.types import ConfigType
from . import wpa2_eap
@@ -269,9 +270,20 @@ def final_validate(config):
)
def _consume_wifi_sockets(config: ConfigType) -> ConfigType:
"""Register UDP PCBs used internally by lwIP for DHCP and DNS."""
from esphome.components import socket
# lwIP allocates UDP PCBs for DHCP client and DNS resolver internally.
# These are not application sockets but consume MEMP_NUM_UDP_PCB pool entries.
socket.consume_sockets(2, "wifi.lwip_internal", socket.SOCKET_UDP)(config)
return config
FINAL_VALIDATE_SCHEMA = cv.All(
final_validate,
validate_variant,
_consume_wifi_sockets,
)