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

[ethernet] Fix permanent component failure from undocumented ESP_FAIL in IPv6 setup

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-14 09:05:28 -05:00
parent 7e6b11ce84
commit 3a4a01ac51
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -300,6 +300,7 @@ void EthernetComponent::loop() {
this->state_ = EthernetComponentState::CONNECTING; this->state_ = EthernetComponentState::CONNECTING;
this->start_connect_(); this->start_connect_();
} else { } else {
this->finish_connect_();
// When connected and stable, disable the loop to save CPU cycles // When connected and stable, disable the loop to save CPU cycles
this->disable_loop(); this->disable_loop();
} }
@@ -486,10 +487,27 @@ void EthernetComponent::got_ip6_event_handler(void *arg, esp_event_base_t event_
} }
#endif /* USE_NETWORK_IPV6 */ #endif /* USE_NETWORK_IPV6 */
void EthernetComponent::finish_connect_() {
#if USE_NETWORK_IPV6
// Retry IPv6 link-local setup if it failed during initial connect
// This handles the case where IPv6 setup failed in start_connect_()
// due to the interface not being fully ready (timing issue).
// By now the interface is stable since we're in CONNECTED state.
if (!this->ipv6_setup_done_) {
esp_err_t err = esp_netif_create_ip6_linklocal(this->eth_netif_);
if (err == ESP_OK) {
ESP_LOGD(TAG, "IPv6 link-local address created (retry succeeded)");
}
this->ipv6_setup_done_ = true; // Only try once in CONNECTED state
}
#endif /* USE_NETWORK_IPV6 */
}
void EthernetComponent::start_connect_() { void EthernetComponent::start_connect_() {
global_eth_component->got_ipv4_address_ = false; global_eth_component->got_ipv4_address_ = false;
#if USE_NETWORK_IPV6 #if USE_NETWORK_IPV6
global_eth_component->ipv6_count_ = 0; global_eth_component->ipv6_count_ = 0;
this->ipv6_setup_done_ = false;
#endif /* USE_NETWORK_IPV6 */ #endif /* USE_NETWORK_IPV6 */
this->connect_begin_ = millis(); this->connect_begin_ = millis();
this->status_set_warning(LOG_STR("waiting for IP configuration")); this->status_set_warning(LOG_STR("waiting for IP configuration"));
@@ -545,9 +563,21 @@ void EthernetComponent::start_connect_() {
} }
} }
#if USE_NETWORK_IPV6 #if USE_NETWORK_IPV6
// Attempt to create IPv6 link-local address
// Note: this may fail with ESP_FAIL if the interface is not fully up yet,
// which can happen after network interruptions. We'll retry in the CONNECTED state 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) {
ESPHL_ERROR_CHECK(err, "Enable IPv6 link local failed"); if (err == ESP_ERR_ESP_NETIF_INVALID_PARAMS) {
// This is a programming error, not a transient failure
ESPHL_ERROR_CHECK(err, "esp_netif_create_ip6_linklocal invalid parameters");
} else {
// ESP_FAIL typically means the interface isn't fully up yet
// This is a timing issue that can occur after network interruptions
// We'll retry once we reach CONNECTED state and the interface is stable
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
}
} }
#endif /* USE_NETWORK_IPV6 */ #endif /* USE_NETWORK_IPV6 */

2
esphome/components/ethernet/ethernet_component.h
View File

@@ -102,6 +102,7 @@ class EthernetComponent : public Component {
#endif /* LWIP_IPV6 */ #endif /* LWIP_IPV6 */
void start_connect_(); void start_connect_();
void finish_connect_();
void dump_connect_params_(); void dump_connect_params_();
/// @brief Set `RMII Reference Clock Select` bit for KSZ8081. /// @brief Set `RMII Reference Clock Select` bit for KSZ8081.
void ksz8081_set_clock_reference_(esp_eth_mac_t *mac); void ksz8081_set_clock_reference_(esp_eth_mac_t *mac);
@@ -144,6 +145,7 @@ class EthernetComponent : public Component {
bool got_ipv4_address_{false}; bool got_ipv4_address_{false};
#if LWIP_IPV6 #if LWIP_IPV6
uint8_t ipv6_count_{0}; uint8_t ipv6_count_{0};
bool ipv6_setup_done_{false};
#endif /* LWIP_IPV6 */ #endif /* LWIP_IPV6 */
// Pointers at the end (naturally aligned) // Pointers at the end (naturally aligned)