mirror/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-03-01 18:34:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'loop_monitored_socket_cleanups' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2026-02-20 18:21:18 -06:00
parent 4dd2b532c9 5ea4b5b74b
commit 3855701f60
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
esphome/components/api/api_server.h
View File

@@ -249,7 +249,8 @@ class APIServer : public Component,
void add_state_subscription_(std::string entity_id, optional<std::string> attribute,
std::function<void(const std::string &)> f, bool once);
#endif // USE_API_HOMEASSISTANT_STATES
// Socket destructor will close or abort depending on platform
// No explicit close() needed — listen sockets have no active connections on
// failure/shutdown. Destructor handles fd cleanup (close or abort per platform).
inline void destroy_socket_() {
delete this->socket_;
this->socket_ = nullptr;

3
esphome/components/captive_portal/dns_server_esp32_idf.h
View File

@@ -14,7 +14,8 @@ class DNSServer {
void process_next_request();
protected:
// Socket destructor will close or abort depending on platform
// No explicit close() needed — listen sockets have no active connections on
// failure/shutdown. Destructor handles fd cleanup (close or abort per platform).
inline void destroy_socket_() {
delete this->socket_;
this->socket_ = nullptr;

3
esphome/components/esphome/ota/ota_esphome.cpp
View File

@@ -452,7 +452,8 @@ void ESPHomeOTAComponent::log_remote_closed_(const LogString *during) {
void ESPHomeOTAComponent::server_failed_(const LogString *msg) {
this->log_socket_error_(msg);
// Socket destructor will close or abort depending on platform
// No explicit close() needed — listen sockets have no active connections on
// failure/shutdown. Destructor handles fd cleanup (close or abort per platform).
delete this->server_;
this->server_ = nullptr;
this->mark_failed();