sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-17 18:52:19 +01:00
Code Issues Releases Wiki Activity

Merge branch 'fix_ethernet_reconnect_ipv6' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-14 10:19:14 -05:00
parent 0359c3120a 2eb02d5440
commit eb5d74f3b1
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
esphome/components/ethernet/ethernet_component.cpp
View File

@@ -490,10 +490,12 @@ void EthernetComponent::got_ip6_event_handler(void *arg, esp_event_base_t event_
void EthernetComponent::finish_connect_() { void EthernetComponent::finish_connect_() {
#if USE_NETWORK_IPV6 #if USE_NETWORK_IPV6
// Retry IPv6 link-local setup if it failed during initial connect // Retry IPv6 link-local setup if it failed during initial connect
// This handles the case where IPv6 setup failed in start_connect_() // This handles the case where min_ipv6_addr_count is NOT set (or is 0),
// because the interface wasn't ready (usually cable unplugged/link down, // allowing us to reach CONNECTED state with just IPv4.
// rarely a timing issue during state transitions). // If IPv6 setup failed in start_connect_() because the interface wasn't ready:
// By now we're in CONNECTED state so the interface is definitely up. // - Bootup timing issues (#10281)
// - Cable unplugged/network interruption (#10705)
// We can now retry since we're in CONNECTED state and the interface is definitely up.
if (!this->ipv6_setup_done_) { if (!this->ipv6_setup_done_) {
esp_err_t err = esp_netif_create_ip6_linklocal(this->eth_netif_); esp_err_t err = esp_netif_create_ip6_linklocal(this->eth_netif_);
if (err == ESP_OK) { if (err == ESP_OK) {
@@ -570,18 +572,23 @@ void EthernetComponent::start_connect_() {
} }
#if USE_NETWORK_IPV6 #if USE_NETWORK_IPV6
// Attempt to create IPv6 link-local address // Attempt to create IPv6 link-local address
// Note: this may fail with ESP_FAIL if the interface is not up yet // We MUST attempt this here, not just in finish_connect_(), because with
// (typically cable unplugged, but could be timing during link transitions). // min_ipv6_addr_count set, the component won't reach CONNECTED state without IPv6.
// We'll retry in the CONNECTED state if it fails here. // However, this may fail with ESP_FAIL if the interface is not up yet:
// - At bootup when link isn't ready (#10281)
// - After disconnection/cable unplugged (#10705)
// We'll retry in finish_connect_() if it fails here.
err = esp_netif_create_ip6_linklocal(this->eth_netif_); err = esp_netif_create_ip6_linklocal(this->eth_netif_);
if (err != ESP_OK) { if (err != ESP_OK) {
if (err == ESP_ERR_ESP_NETIF_INVALID_PARAMS) { if (err == ESP_ERR_ESP_NETIF_INVALID_PARAMS) {
// This is a programming error, not a transient failure // This is a programming error, not a transient failure
ESPHL_ERROR_CHECK(err, "esp_netif_create_ip6_linklocal invalid parameters"); ESPHL_ERROR_CHECK(err, "esp_netif_create_ip6_linklocal invalid parameters");
} else { } else {
// ESP_FAIL means the interface isn't up yet (e.g., cable unplugged, link down) // ESP_FAIL means the interface isn't up yet
// This is expected during reconnection attempts after network interruptions // This is expected and non-fatal, happens in multiple scenarios:
// We'll retry once we reach CONNECTED state and the interface is actually up // - During reconnection after network interruptions (#10705)
// - At bootup when the link isn't ready yet (#10281)
// We'll retry once we reach CONNECTED state and the interface is up
ESP_LOGW(TAG, "esp_netif_create_ip6_linklocal failed: %s", esp_err_to_name(err)); ESP_LOGW(TAG, "esp_netif_create_ip6_linklocal failed: %s", esp_err_to_name(err));
// Don't mark component as failed - this is a transient error // Don't mark component as failed - this is a transient error
} }