From 520f8eb9ef9a97f9b8e02fd12a2d4987e21b2a30 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sun, 4 Jan 2026 11:18:44 -1000 Subject: [PATCH] simplify --- esphome/components/api/api_frame_helper.h | 2 +- esphome/components/api/api_server.cpp | 2 +- esphome/components/esphome/ota/ota_esphome.cpp | 2 +- esphome/components/socket/socket.cpp | 8 ++++---- esphome/components/socket/socket.h | 12 ++++++------ 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/esphome/components/api/api_frame_helper.h b/esphome/components/api/api_frame_helper.h index 2364aca4ed..cc113b2dbe 100644 --- a/esphome/components/api/api_frame_helper.h +++ b/esphome/components/api/api_frame_helper.h @@ -201,7 +201,7 @@ class APIFrameHelper { // Client name buffer - stores name from Hello message or initial peername char client_name_[CLIENT_INFO_NAME_MAX_LEN]{}; // Cached peername/IP address - captured at init time for availability after socket failure - char client_peername_[socket::PEERNAME_MAX_LEN]{}; + char client_peername_[socket::SOCKADDR_STR_LEN]{}; // Group smaller types together uint16_t rx_buf_len_ = 0; diff --git a/esphome/components/api/api_server.cpp b/esphome/components/api/api_server.cpp index 71bccc1337..3c01c6809a 100644 --- a/esphome/components/api/api_server.cpp +++ b/esphome/components/api/api_server.cpp @@ -125,7 +125,7 @@ void APIServer::loop() { if (!sock) break; - char peername[socket::PEERNAME_MAX_LEN]; + char peername[socket::SOCKADDR_STR_LEN]; sock->getpeername_to(peername); // Check if we're at the connection limit diff --git a/esphome/components/esphome/ota/ota_esphome.cpp b/esphome/components/esphome/ota/ota_esphome.cpp index 80321eed02..22266524a7 100644 --- a/esphome/components/esphome/ota/ota_esphome.cpp +++ b/esphome/components/esphome/ota/ota_esphome.cpp @@ -444,7 +444,7 @@ void ESPHomeOTAComponent::log_socket_error_(const LogString *msg) { void ESPHomeOTAComponent::log_read_error_(const LogString *what) { ESP_LOGW(TAG, "Read %s failed", LOG_STR_ARG(what)); } void ESPHomeOTAComponent::log_start_(const LogString *phase) { - char peername[socket::PEERNAME_MAX_LEN]; + char peername[socket::SOCKADDR_STR_LEN]; this->client_->getpeername_to(peername); ESP_LOGD(TAG, "Starting %s from %s", LOG_STR_ARG(phase), peername); } diff --git a/esphome/components/socket/socket.cpp b/esphome/components/socket/socket.cpp index bce26f09c3..e5b0579b02 100644 --- a/esphome/components/socket/socket.cpp +++ b/esphome/components/socket/socket.cpp @@ -11,7 +11,7 @@ namespace esphome::socket { Socket::~Socket() {} // Format sockaddr into caller-provided buffer, returns length written (excluding null) -static size_t format_sockaddr_to(const struct sockaddr_storage &storage, std::span buf) { +static size_t format_sockaddr_to(const struct sockaddr_storage &storage, std::span buf) { if (storage.ss_family == AF_INET) { const auto *addr = reinterpret_cast(&storage); #ifdef USE_SOCKET_IMPL_LWIP_TCP @@ -23,7 +23,7 @@ static size_t format_sockaddr_to(const struct sockaddr_storage &storage, std::sp return strlen(buf.data()); #endif } -#if LWIP_IPV6 +#if USE_NETWORK_IPV6 else if (storage.ss_family == AF_INET6) { const auto *addr = reinterpret_cast(&storage); #ifdef USE_SOCKET_IMPL_LWIP_TCP @@ -46,7 +46,7 @@ static size_t format_sockaddr_to(const struct sockaddr_storage &storage, std::sp return 0; } -size_t Socket::getpeername_to(std::span buf) { +size_t Socket::getpeername_to(std::span buf) { struct sockaddr_storage storage; socklen_t len = sizeof(storage); if (this->getpeername(reinterpret_cast(&storage), &len) != 0) { @@ -56,7 +56,7 @@ size_t Socket::getpeername_to(std::span buf) { return format_sockaddr_to(storage, buf); } -size_t Socket::getsockname_to(std::span buf) { +size_t Socket::getsockname_to(std::span buf) { struct sockaddr_storage storage; socklen_t len = sizeof(storage); if (this->getsockname(reinterpret_cast(&storage), &len) != 0) { diff --git a/esphome/components/socket/socket.h b/esphome/components/socket/socket.h index 61311a6808..9f9f61de85 100644 --- a/esphome/components/socket/socket.h +++ b/esphome/components/socket/socket.h @@ -9,13 +9,13 @@ #if defined(USE_SOCKET_IMPL_LWIP_TCP) || defined(USE_SOCKET_IMPL_LWIP_SOCKETS) || defined(USE_SOCKET_IMPL_BSD_SOCKETS) namespace esphome::socket { -// Maximum length for peer name string (IP address without port) +// Maximum length for formatted socket address string (IP address without port) // IPv4: "255.255.255.255" = 15 chars + null = 16 // IPv6: full address = 45 chars + null = 46 -#if LWIP_IPV6 -static constexpr size_t PEERNAME_MAX_LEN = 46; // INET6_ADDRSTRLEN +#if USE_NETWORK_IPV6 +static constexpr size_t SOCKADDR_STR_LEN = 46; // INET6_ADDRSTRLEN #else -static constexpr size_t PEERNAME_MAX_LEN = 16; // INET_ADDRSTRLEN +static constexpr size_t SOCKADDR_STR_LEN = 16; // INET_ADDRSTRLEN #endif class Socket { @@ -46,10 +46,10 @@ class Socket { /// Format peer address into a fixed-size buffer (no heap allocation) /// Non-virtual wrapper around getpeername() - can be optimized away if unused /// Returns number of characters written (excluding null terminator), or 0 on error - size_t getpeername_to(std::span buf); + size_t getpeername_to(std::span buf); /// Format local address into a fixed-size buffer (no heap allocation) /// Non-virtual wrapper around getsockname() - can be optimized away if unused - size_t getsockname_to(std::span buf); + size_t getsockname_to(std::span buf); virtual int getsockopt(int level, int optname, void *optval, socklen_t *optlen) = 0; virtual int setsockopt(int level, int optname, const void *optval, socklen_t optlen) = 0; virtual int listen(int backlog) = 0;