From 591b5fa25babdb2c21ca701e0c09470d07f04b2f Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Sun, 4 Jan 2026 11:45:27 -1000
Subject: [PATCH] all 3

---
 esphome/components/socket/socket.cpp | 71 ++++++++++++++++------------
 1 file changed, 41 insertions(+), 30 deletions(-)

diff --git a/esphome/components/socket/socket.cpp b/esphome/components/socket/socket.cpp
index b81d05155e..8722e11158 100644
--- a/esphome/components/socket/socket.cpp
+++ b/esphome/components/socket/socket.cpp
@@ -10,50 +10,61 @@ namespace esphome::socket {
 
 Socket::~Socket() {}
 
+// Platform-specific inet_ntop wrappers
+#ifdef USE_SOCKET_IMPL_LWIP_TCP
+// LWIP raw TCP (ESP8266) uses inet_ntoa_r which takes struct by value
+static inline const char *esphome_inet_ntop4(const void *addr, char *buf, size_t size) {
+  inet_ntoa_r(*reinterpret_cast<const struct in_addr *>(addr), buf, size);
+  return buf;
+}
+#if USE_NETWORK_IPV6
+static inline const char *esphome_inet_ntop6(const void *addr, char *buf, size_t size) {
+  inet6_ntoa_r(*reinterpret_cast<const ip6_addr_t *>(addr), buf, size);
+  return buf;
+}
+#endif
+#elif defined(USE_SOCKET_IMPL_LWIP_SOCKETS)
+// LWIP sockets (LibreTiny, ESP32 Arduino)
+static inline const char *esphome_inet_ntop4(const void *addr, char *buf, size_t size) {
+  return lwip_inet_ntop(AF_INET, addr, buf, size);
+}
+#if USE_NETWORK_IPV6
+static inline const char *esphome_inet_ntop6(const void *addr, char *buf, size_t size) {
+  return lwip_inet_ntop(AF_INET6, addr, buf, size);
+}
+#endif
+#else
+// BSD sockets (host, ESP32-IDF)
+static inline const char *esphome_inet_ntop4(const void *addr, char *buf, size_t size) {
+  return inet_ntop(AF_INET, addr, buf, size);
+}
+#if USE_NETWORK_IPV6
+static inline const char *esphome_inet_ntop6(const void *addr, char *buf, size_t size) {
+  return inet_ntop(AF_INET6, addr, buf, size);
+}
+#endif
+#endif
+
 // Format sockaddr into caller-provided buffer, returns length written (excluding null)
 static size_t format_sockaddr_to(const struct sockaddr_storage &storage, std::span<char, SOCKADDR_STR_LEN> buf) {
   if (storage.ss_family == AF_INET) {
     const auto *addr = reinterpret_cast<const struct sockaddr_in *>(&storage);
-#ifdef USE_SOCKET_IMPL_LWIP_TCP
-    // LWIP raw TCP (ESP8266) uses inet_ntoa_r
-    inet_ntoa_r(addr->sin_addr, buf.data(), buf.size());
-    return strlen(buf.data());
-#elif defined(USE_SOCKET_IMPL_LWIP_SOCKETS)
-    // LWIP sockets (LibreTiny, ESP32 Arduino) uses lwip_inet_ntop
-    if (lwip_inet_ntop(AF_INET, &addr->sin_addr, buf.data(), buf.size()) != nullptr)
+    if (esphome_inet_ntop4(&addr->sin_addr, buf.data(), buf.size()) != nullptr)
       return strlen(buf.data());
-#else
-    // BSD sockets (host, ESP32-IDF)
-    if (inet_ntop(AF_INET, &addr->sin_addr, buf.data(), buf.size()) != nullptr)
-      return strlen(buf.data());
-#endif
   }
 #if USE_NETWORK_IPV6
   else if (storage.ss_family == AF_INET6) {
     const auto *addr = reinterpret_cast<const struct sockaddr_in6 *>(&storage);
-#ifdef USE_SOCKET_IMPL_LWIP_TCP
-    // LWIP raw TCP (ESP8266) uses inet6_ntoa_r
-    inet6_ntoa_r(addr->sin6_addr, buf.data(), buf.size());
-    return strlen(buf.data());
-#elif defined(USE_SOCKET_IMPL_LWIP_SOCKETS)
-    // LWIP sockets - format IPv4-mapped IPv6 as IPv4
+#ifndef USE_SOCKET_IMPL_LWIP_TCP
+    // Format IPv4-mapped IPv6 addresses as regular IPv4 (not supported on ESP8266 raw TCP)
     if (addr->sin6_addr.un.u32_addr[0] == 0 && addr->sin6_addr.un.u32_addr[1] == 0 &&
         addr->sin6_addr.un.u32_addr[2] == htonl(0xFFFF) &&
-        lwip_inet_ntop(AF_INET, &addr->sin6_addr.un.u32_addr[3], buf.data(), buf.size()) != nullptr) {
+        esphome_inet_ntop4(&addr->sin6_addr.un.u32_addr[3], buf.data(), buf.size()) != nullptr) {
       return strlen(buf.data());
     }
-    if (lwip_inet_ntop(AF_INET6, &addr->sin6_addr, buf.data(), buf.size()) != nullptr)
-      return strlen(buf.data());
-#else
-    // BSD sockets - format IPv4-mapped IPv6 as IPv4
-    if (addr->sin6_addr.un.u32_addr[0] == 0 && addr->sin6_addr.un.u32_addr[1] == 0 &&
-        addr->sin6_addr.un.u32_addr[2] == htonl(0xFFFF) &&
-        inet_ntop(AF_INET, &addr->sin6_addr.un.u32_addr[3], buf.data(), buf.size()) != nullptr) {
-      return strlen(buf.data());
-    }
-    if (inet_ntop(AF_INET6, &addr->sin6_addr, buf.data(), buf.size()) != nullptr)
-      return strlen(buf.data());
 #endif
+    if (esphome_inet_ntop6(&addr->sin6_addr, buf.data(), buf.size()) != nullptr)
+      return strlen(buf.data());
   }
 #endif
   buf[0] = '\0';