From c410171a636dd3ca8267d2e08abb2e45f3e4e794 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sat, 27 Dec 2025 19:06:09 -1000 Subject: [PATCH] remove old way --- esphome/components/api/api_connection.h | 2 -- esphome/components/api/api_frame_helper.h | 1 - .../components/socket/bsd_sockets_impl.cpp | 21 ------------------- .../components/socket/lwip_raw_tcp_impl.cpp | 21 ------------------- .../components/socket/lwip_sockets_impl.cpp | 21 ------------------- esphome/components/socket/socket.h | 2 -- 6 files changed, 68 deletions(-) diff --git a/esphome/components/api/api_connection.h b/esphome/components/api/api_connection.h index 8b3eb88f87..b95f029b06 100644 --- a/esphome/components/api/api_connection.h +++ b/esphome/components/api/api_connection.h @@ -289,8 +289,6 @@ class APIConnection final : public APIServerConnection { size_t get_peername_to(std::span buf) const { return this->helper_->getpeername_to(buf); } - /// Get peer name as std::string - use sparingly, allocates on heap - std::string get_peername() const { return this->helper_->getpeername(); } protected: // Helper function to handle authentication completion diff --git a/esphome/components/api/api_frame_helper.h b/esphome/components/api/api_frame_helper.h index 2b0b1f40dc..37e972e205 100644 --- a/esphome/components/api/api_frame_helper.h +++ b/esphome/components/api/api_frame_helper.h @@ -97,7 +97,6 @@ class APIFrameHelper { virtual APIError loop(); virtual APIError read_packet(ReadPacketBuffer *buffer) = 0; bool can_write_without_blocking() { return this->state_ == State::DATA && this->tx_buf_count_ == 0; } - std::string getpeername() { return socket_->getpeername(); } int getpeername(struct sockaddr *addr, socklen_t *addrlen) { return socket_->getpeername(addr, addrlen); } size_t getpeername_to(std::span buf) { return socket_->getpeername_to(buf); } APIError close() { diff --git a/esphome/components/socket/bsd_sockets_impl.cpp b/esphome/components/socket/bsd_sockets_impl.cpp index 567608bd4c..8596e71e6e 100644 --- a/esphome/components/socket/bsd_sockets_impl.cpp +++ b/esphome/components/socket/bsd_sockets_impl.cpp @@ -38,13 +38,6 @@ size_t format_sockaddr_to(const struct sockaddr_storage &storage, std::span 0) - return std::string{buf}; - return {}; -} - class BSDSocketImpl final : public Socket { public: BSDSocketImpl(int fd, bool monitor_loop = false) : fd_(fd) { @@ -100,13 +93,6 @@ class BSDSocketImpl final : public Socket { int getpeername(struct sockaddr *addr, socklen_t *addrlen) override { return ::getpeername(this->fd_, addr, addrlen); } - std::string getpeername() final { - struct sockaddr_storage storage; - socklen_t len = sizeof(storage); - if (::getpeername(this->fd_, (struct sockaddr *) &storage, &len) != 0) - return {}; - return format_sockaddr(storage); - } size_t getpeername_to(std::span buf) override { struct sockaddr_storage storage; socklen_t len = sizeof(storage); @@ -119,13 +105,6 @@ class BSDSocketImpl final : public Socket { int getsockname(struct sockaddr *addr, socklen_t *addrlen) override { return ::getsockname(this->fd_, addr, addrlen); } - std::string getsockname() final { - struct sockaddr_storage storage; - socklen_t len = sizeof(storage); - if (::getsockname(this->fd_, (struct sockaddr *) &storage, &len) != 0) - return {}; - return format_sockaddr(storage); - } int getsockopt(int level, int optname, void *optval, socklen_t *optlen) override { return ::getsockopt(this->fd_, level, optname, optval, optlen); } diff --git a/esphome/components/socket/lwip_raw_tcp_impl.cpp b/esphome/components/socket/lwip_raw_tcp_impl.cpp index 1c95a5863a..437aa5b354 100644 --- a/esphome/components/socket/lwip_raw_tcp_impl.cpp +++ b/esphome/components/socket/lwip_raw_tcp_impl.cpp @@ -189,13 +189,6 @@ class LWIPRawImpl : public Socket { } return this->ip2sockaddr_(&pcb_->remote_ip, pcb_->remote_port, name, addrlen); } - std::string getpeername() final { - if (pcb_ == nullptr) { - errno = ECONNRESET; - return ""; - } - return this->format_ip_address_(pcb_->remote_ip); - } size_t getpeername_to(std::span buf) final { if (pcb_ == nullptr) { errno = ECONNRESET; @@ -215,13 +208,6 @@ class LWIPRawImpl : public Socket { } return this->ip2sockaddr_(&pcb_->local_ip, pcb_->local_port, name, addrlen); } - std::string getsockname() final { - if (pcb_ == nullptr) { - errno = ECONNRESET; - return ""; - } - return this->format_ip_address_(pcb_->local_ip); - } int getsockopt(int level, int optname, void *optval, socklen_t *optlen) final { if (pcb_ == nullptr) { errno = ECONNRESET; @@ -541,13 +527,6 @@ class LWIPRawImpl : public Socket { return 0; } - std::string format_ip_address_(const ip_addr_t &ip) { - char buffer[PEERNAME_MAX_LEN]; - if (format_ip_address_to_(ip, buffer) > 0) - return std::string(buffer); - return {}; - } - int ip2sockaddr_(ip_addr_t *ip, uint16_t port, struct sockaddr *name, socklen_t *addrlen) { if (family_ == AF_INET) { if (*addrlen < sizeof(struct sockaddr_in)) { diff --git a/esphome/components/socket/lwip_sockets_impl.cpp b/esphome/components/socket/lwip_sockets_impl.cpp index 1dd9bb91bf..4a1069143a 100644 --- a/esphome/components/socket/lwip_sockets_impl.cpp +++ b/esphome/components/socket/lwip_sockets_impl.cpp @@ -35,13 +35,6 @@ size_t format_sockaddr_to(const struct sockaddr_storage &storage, std::span 0) - return std::string{buf}; - return {}; -} - class LwIPSocketImpl final : public Socket { public: LwIPSocketImpl(int fd, bool monitor_loop = false) : fd_(fd) { @@ -99,13 +92,6 @@ class LwIPSocketImpl final : public Socket { int getpeername(struct sockaddr *addr, socklen_t *addrlen) override { return lwip_getpeername(this->fd_, addr, addrlen); } - std::string getpeername() final { - struct sockaddr_storage storage; - socklen_t len = sizeof(storage); - if (lwip_getpeername(this->fd_, (struct sockaddr *) &storage, &len) != 0) - return {}; - return format_sockaddr(storage); - } size_t getpeername_to(std::span buf) override { struct sockaddr_storage storage; socklen_t len = sizeof(storage); @@ -118,13 +104,6 @@ class LwIPSocketImpl final : public Socket { int getsockname(struct sockaddr *addr, socklen_t *addrlen) override { return lwip_getsockname(this->fd_, addr, addrlen); } - std::string getsockname() final { - struct sockaddr_storage storage; - socklen_t len = sizeof(storage); - if (lwip_getsockname(this->fd_, (struct sockaddr *) &storage, &len) != 0) - return {}; - return format_sockaddr(storage); - } int getsockopt(int level, int optname, void *optval, socklen_t *optlen) override { return lwip_getsockopt(this->fd_, level, optname, optval, optlen); } diff --git a/esphome/components/socket/socket.h b/esphome/components/socket/socket.h index 8fa2cf328d..85516bd33b 100644 --- a/esphome/components/socket/socket.h +++ b/esphome/components/socket/socket.h @@ -41,12 +41,10 @@ class Socket { virtual int shutdown(int how) = 0; virtual int getpeername(struct sockaddr *addr, socklen_t *addrlen) = 0; - virtual std::string getpeername() = 0; /// Format peer address into a fixed-size buffer (no heap allocation) /// Returns number of characters written (excluding null terminator), or 0 on error virtual size_t getpeername_to(std::span buf) = 0; virtual int getsockname(struct sockaddr *addr, socklen_t *addrlen) = 0; - virtual std::string getsockname() = 0; 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;