Support for LibreTiny platform (RTL8710, BK7231 & other modules) (#3509)

Co-authored-by: Kuba Szczodrzyński <kuba@szczodrzynski.pl>
Co-authored-by: Sam Neirinck <git@samneirinck.com>
Co-authored-by: David Buezas <dbuezas@users.noreply.github.com>
Co-authored-by: Stroe Andrei Catalin <catalin2402@gmail.com>
Co-authored-by: Sam Neirinck <github@samneirinck.be>
Co-authored-by: Péter Sárközi <xmisterhu@gmail.com>
Co-authored-by: Hajo Noerenberg <hn@users.noreply.github.com>

esphome/components/socket/__init__.py

@@ -5,6 +5,7 @@ CODEOWNERS = ["@esphome/core"]
 
 CONF_IMPLEMENTATION = "implementation"
 IMPLEMENTATION_LWIP_TCP = "lwip_tcp"
+IMPLEMENTATION_LWIP_SOCKETS = "lwip_sockets"
 IMPLEMENTATION_BSD_SOCKETS = "bsd_sockets"
 
 CONFIG_SCHEMA = cv.Schema(
@@ -14,9 +15,15 @@ CONFIG_SCHEMA = cv.Schema(
             esp8266=IMPLEMENTATION_LWIP_TCP,
             esp32=IMPLEMENTATION_BSD_SOCKETS,
             rp2040=IMPLEMENTATION_LWIP_TCP,
+            bk72xx=IMPLEMENTATION_LWIP_SOCKETS,
+            rtl87xx=IMPLEMENTATION_LWIP_SOCKETS,
             host=IMPLEMENTATION_BSD_SOCKETS,
         ): cv.one_of(
-            IMPLEMENTATION_LWIP_TCP, IMPLEMENTATION_BSD_SOCKETS, lower=True, space="_"
+            IMPLEMENTATION_LWIP_TCP,
+            IMPLEMENTATION_LWIP_SOCKETS,
+            IMPLEMENTATION_BSD_SOCKETS,
+            lower=True,
+            space="_",
         ),
     }
 )
@@ -26,5 +33,7 @@ async def to_code(config):
     impl = config[CONF_IMPLEMENTATION]
     if impl == IMPLEMENTATION_LWIP_TCP:
         cg.add_define("USE_SOCKET_IMPL_LWIP_TCP")
+    elif impl == IMPLEMENTATION_LWIP_SOCKETS:
+        cg.add_define("USE_SOCKET_IMPL_LWIP_SOCKETS")
     elif impl == IMPLEMENTATION_BSD_SOCKETS:
         cg.add_define("USE_SOCKET_IMPL_BSD_SOCKETS")

esphome/components/socket/headers.h

@@ -120,6 +120,35 @@ struct iovec {
 
 #endif  // USE_SOCKET_IMPL_LWIP_TCP
 
+#ifdef USE_SOCKET_IMPL_LWIP_SOCKETS
+
+// standard lwIP's compatibility macros will interfere
+// with Socket class function names - disable the macros
+// and use real function names instead
+#undef LWIP_COMPAT_SOCKETS
+#define LWIP_COMPAT_SOCKETS 0
+
+#include "lwip/sockets.h"
+#include <sys/types.h>
+
+#ifdef USE_ARDUINO
+// arduino-esp32 declares a global var called INADDR_NONE which is replaced
+// by the define
+#ifdef INADDR_NONE
+#undef INADDR_NONE
+#endif
+// not defined for ESP32
+using socklen_t = uint32_t;
+
+#define ESPHOME_INADDR_ANY ((uint32_t) 0x00000000UL)
+#define ESPHOME_INADDR_NONE ((uint32_t) 0xFFFFFFFFUL)
+#else  // !USE_ESP32
+#define ESPHOME_INADDR_ANY INADDR_ANY
+#define ESPHOME_INADDR_NONE INADDR_NONE
+#endif
+
+#endif  // USE_SOCKET_IMPL_LWIP_SOCKETS
+
 #ifdef USE_SOCKET_IMPL_BSD_SOCKETS
 
 #include <cstdint>

esphome/components/socket/lwip_sockets_impl.cpp

@@ -0,0 +1,115 @@
+#include "socket.h"
+#include "esphome/core/defines.h"
+#include "esphome/core/helpers.h"
+
+#ifdef USE_SOCKET_IMPL_LWIP_SOCKETS
+
+#include <cstring>
+
+namespace esphome {
+namespace socket {
+
+std::string format_sockaddr(const struct sockaddr_storage &storage) {
+  if (storage.ss_family == AF_INET) {
+    const struct sockaddr_in *addr = reinterpret_cast<const struct sockaddr_in *>(&storage);
+    char buf[INET_ADDRSTRLEN];
+    const char *ret = lwip_inet_ntop(AF_INET, &addr->sin_addr, buf, sizeof(buf));
+    if (ret == nullptr)
+      return {};
+    return std::string{buf};
+  }
+#if LWIP_IPV6
+  else if (storage.ss_family == AF_INET6) {
+    const struct sockaddr_in6 *addr = reinterpret_cast<const struct sockaddr_in6 *>(&storage);
+    char buf[INET6_ADDRSTRLEN];
+    const char *ret = lwip_inet_ntop(AF_INET6, &addr->sin6_addr, buf, sizeof(buf));
+    if (ret == nullptr)
+      return {};
+    return std::string{buf};
+  }
+#endif
+  return {};
+}
+
+class LwIPSocketImpl : public Socket {
+ public:
+  LwIPSocketImpl(int fd) : fd_(fd) {}
+  ~LwIPSocketImpl() override {
+    if (!closed_) {
+      close();  // NOLINT(clang-analyzer-optin.cplusplus.VirtualCall)
+    }
+  }
+  std::unique_ptr<Socket> accept(struct sockaddr *addr, socklen_t *addrlen) override {
+    int fd = lwip_accept(fd_, addr, addrlen);
+    if (fd == -1)
+      return {};
+    return make_unique<LwIPSocketImpl>(fd);
+  }
+  int bind(const struct sockaddr *addr, socklen_t addrlen) override { return lwip_bind(fd_, addr, addrlen); }
+  int close() override {
+    int ret = lwip_close(fd_);
+    closed_ = true;
+    return ret;
+  }
+  int shutdown(int how) override { return lwip_shutdown(fd_, how); }
+
+  int getpeername(struct sockaddr *addr, socklen_t *addrlen) override { return lwip_getpeername(fd_, addr, addrlen); }
+  std::string getpeername() override {
+    struct sockaddr_storage storage;
+    socklen_t len = sizeof(storage);
+    int err = this->getpeername((struct sockaddr *) &storage, &len);
+    if (err != 0)
+      return {};
+    return format_sockaddr(storage);
+  }
+  int getsockname(struct sockaddr *addr, socklen_t *addrlen) override { return lwip_getsockname(fd_, addr, addrlen); }
+  std::string getsockname() override {
+    struct sockaddr_storage storage;
+    socklen_t len = sizeof(storage);
+    int err = this->getsockname((struct sockaddr *) &storage, &len);
+    if (err != 0)
+      return {};
+    return format_sockaddr(storage);
+  }
+  int getsockopt(int level, int optname, void *optval, socklen_t *optlen) override {
+    return lwip_getsockopt(fd_, level, optname, optval, optlen);
+  }
+  int setsockopt(int level, int optname, const void *optval, socklen_t optlen) override {
+    return lwip_setsockopt(fd_, level, optname, optval, optlen);
+  }
+  int listen(int backlog) override { return lwip_listen(fd_, backlog); }
+  ssize_t read(void *buf, size_t len) override { return lwip_read(fd_, buf, len); }
+  ssize_t readv(const struct iovec *iov, int iovcnt) override { return lwip_readv(fd_, iov, iovcnt); }
+  ssize_t write(const void *buf, size_t len) override { return lwip_write(fd_, buf, len); }
+  ssize_t send(void *buf, size_t len, int flags) { return lwip_send(fd_, buf, len, flags); }
+  ssize_t writev(const struct iovec *iov, int iovcnt) override { return lwip_writev(fd_, iov, iovcnt); }
+  ssize_t sendto(const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen) override {
+    return lwip_sendto(fd_, buf, len, flags, to, tolen);
+  }
+  int setblocking(bool blocking) override {
+    int fl = lwip_fcntl(fd_, F_GETFL, 0);
+    if (blocking) {
+      fl &= ~O_NONBLOCK;
+    } else {
+      fl |= O_NONBLOCK;
+    }
+    lwip_fcntl(fd_, F_SETFL, fl);
+    return 0;
+  }
+
+ protected:
+  int fd_;
+  bool closed_ = false;
+};
+
+std::unique_ptr<Socket> socket(int domain, int type, int protocol) {
+  int ret = lwip_socket(domain, type, protocol);
+  if (ret == -1)
+    return nullptr;
+  return std::unique_ptr<Socket>{new LwIPSocketImpl(ret)};
+}
+
+}  // namespace socket
+}  // namespace esphome
+
+#endif  // USE_SOCKET_IMPL_LWIP_SOCKETS