github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-18 02:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

tweaks

Browse Source
This commit is contained in:
J. Nick Koston
2026-03-16 10:51:54 -10:00
parent eef806c806
commit dde81d3f63
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/socket/lwip_raw_tcp_impl.cpp
+14 -8
View File
@@ -1005,8 +1005,8 @@ LWIPRawUDPImpl::~LWIPRawUDPImpl() {
}
}
int LWIPRawUDPImpl::bind_internal_(const struct sockaddr *name, socklen_t addrlen) {
LWIP_LOCK();
int LWIPRawUDPImpl::bind_internal_locked_(const struct sockaddr *name, socklen_t addrlen) {
// Caller must hold LWIP_LOCK
if (this->pcb_ == nullptr) {
errno = EBADF;
return -1;
@@ -1032,10 +1032,18 @@ int LWIPRawUDPImpl::bind_internal_(const struct sockaddr *name, socklen_t addrle
return lwip_bind_err(udp_bind(this->pcb_, &ip, port));
}
int LWIPRawUDPImpl::bind(const struct sockaddr *name, socklen_t addrlen) { return this->bind_internal_(name, addrlen); }
int LWIPRawUDPImpl::bind(const struct sockaddr *name, socklen_t addrlen) {
LWIP_LOCK();
return this->bind_internal_locked_(name, addrlen);
}
int LWIPRawUDPImpl::close() {
LWIP_LOCK();
return this->close_internal_locked_();
}
int LWIPRawUDPImpl::close_internal_locked_() {
// Caller must hold LWIP_LOCK
if (this->pcb_ == nullptr) {
errno = EBADF;
return -1;
@@ -1208,13 +1216,13 @@ int LWIPRawUDPRecvImpl::close() {
this->rx_read_idx_ = (this->rx_read_idx_ + 1) & UDP_RX_MASK;
this->rx_count_--;
}
// close() returns EBADF if already closed, which is fine from destructor
return LWIPRawUDPImpl::close();
// close_internal_locked_() returns EBADF if already closed, which is fine from destructor
return this->close_internal_locked_();
}
int LWIPRawUDPRecvImpl::bind(const struct sockaddr *name, socklen_t addrlen) {
LWIP_LOCK();
int ret = this->bind_internal_(name, addrlen);
int ret = this->bind_internal_locked_(name, addrlen);
if (ret != 0)
return ret;
// Register recv callback now that we're bound and ready to receive
@@ -1316,7 +1324,6 @@ std::unique_ptr<Socket> socket_loop_monitored(int domain, int type, int protocol
std::unique_ptr<UDPSocket> socket_udp(int domain, int protocol) {
(void) protocol; // Raw lwip UDP ignores protocol; kept for API compatibility
LWIP_LOCK();
auto sock = make_unique<LWIPRawUDPImpl>((sa_family_t) domain);
if (!sock->is_valid()) {
errno = ENOMEM;
@@ -1327,7 +1334,6 @@ std::unique_ptr<UDPSocket> socket_udp(int domain, int protocol) {
std::unique_ptr<UDPRecvSocket> socket_udp_recv(int domain, int protocol) {
(void) protocol; // Raw lwip UDP ignores protocol; kept for API compatibility
LWIP_LOCK();
auto sock = make_unique<LWIPRawUDPRecvImpl>((sa_family_t) domain);
if (!sock->is_valid()) {
errno = ENOMEM;
esphome/components/socket/lwip_raw_tcp_impl.h
+5 -2
View File
@@ -242,8 +242,11 @@ class LWIPRawUDPImpl {
/// Convert lwip ip_addr_t and port to sockaddr.
int ip2sockaddr_(const ip_addr_t *ip, uint16_t port, struct sockaddr *name, socklen_t *addrlen);
/// Shared bind logic — parses sockaddr and calls udp_bind.
int bind_internal_(const struct sockaddr *name, socklen_t addrlen);
/// Shared bind logic — parses sockaddr and calls udp_bind. Caller must hold LWIP_LOCK.
int bind_internal_locked_(const struct sockaddr *name, socklen_t addrlen);
/// Shared close logic — unregisters and removes udp pcb. Caller must hold LWIP_LOCK.
int close_internal_locked_();
struct udp_pcb *pcb_{nullptr};
sa_family_t family_{0};