Skip to content

Fix compatibility with ESPHome 2023.4 #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joshuaspence wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix compatibility with ESPHome 2023.4 #40

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ef23f0
Fix compatibility with ESPHome 2023.4
joshuaspence Apr 20, 2023
3b253a0
Add error checking
joshuaspence Apr 20, 2023
bf80a89
Address feedback
joshuaspence Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 37 additions & 3 deletions components/stream_server/stream_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "esphome/core/helpers.h"
#include "esphome/core/log.h"
#include "esphome/core/util.h"
#include "esphome/core/version.h"

#include "esphome/components/network/util.h"
#include "esphome/components/socket/socket.h"
Expand All @@ -18,12 +19,45 @@ void StreamServerComponent::setup() {
this->buf_ = std::unique_ptr<uint8_t[]>{new uint8_t[this->buf_size_]};

struct sockaddr_storage bind_addr;

#if ESPHOME_VERSION_CODE >= VERSION_CODE(2023, 4, 0)
socklen_t bind_addrlen = socket::set_sockaddr_any(reinterpret_cast<struct sockaddr *>(&bind_addr), sizeof(bind_addr), this->port_);
#else
socklen_t bind_addrlen = socket::set_sockaddr_any(reinterpret_cast<struct sockaddr *>(&bind_addr), sizeof(bind_addr), htons(this->port_));
#endif
if (bind_addrlen == 0) {
ESP_LOGE(TAG, "Socket unable to set sockaddr: errno %d", errno);
this->mark_failed();
return;
}

this->socket_ = socket::socket_ip(SOCK_STREAM, PF_INET);
this->socket_->setblocking(false);
this->socket_->bind(reinterpret_cast<struct sockaddr *>(&bind_addr), bind_addrlen);
this->socket_->listen(8);
if (this->socket_ == nullptr) {
ESP_LOGE(TAG, "Could not create socket.");
this->mark_failed();
return;
}

int err = this->socket_->setblocking(false);
if (err != 0) {
ESP_LOGE(TAG, "Socket unable to set nonblocking mode: errno %d", err);
this->mark_failed();
return;
}

err = this->socket_->bind(reinterpret_cast<struct sockaddr *>(&bind_addr), bind_addrlen);
if (err != 0) {
ESP_LOGE(TAG, "Socket unable to bind: errno %d", errno);
this->mark_failed();
return;
}

err = this->socket_->listen(8);
if (err != 0) {
ESP_LOGE(TAG, "Socket unable to listen: errno %d", errno);
this->mark_failed();
return;
}

this->publish_sensor();
}
Expand Down