sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-04 20:32:21 +01:00
Code Issues Releases Wiki Activity

preen

Browse Source
This commit is contained in:
J. Nick Koston
2025-08-10 18:33:30 -05:00
parent ef676a5a77
commit 2f9d1e6dac
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
esphome/components/esphome/ota/ota_esphome.cpp
View File

@@ -182,7 +182,7 @@ void ESPHomeOTAComponent::handle_data_() {
// Read remaining 4 bytes of magic (we already read the first byte 0x6C in handle_handshake_) // Read remaining 4 bytes of magic (we already read the first byte 0x6C in handle_handshake_)
if (!this->readall_(buf, 4)) { if (!this->readall_(buf, 4)) {
this->log_socket_error_("reading magic bytes"); this->log_read_error_("magic bytes");
goto error; // NOLINT(cppcoreguidelines-avoid-goto) goto error; // NOLINT(cppcoreguidelines-avoid-goto)
} }
// Check remaining magic bytes: 0x26, 0xF7, 0x5C, 0x45 // Check remaining magic bytes: 0x26, 0xF7, 0x5C, 0x45
@@ -201,7 +201,7 @@ void ESPHomeOTAComponent::handle_data_() {
// Read features - 1 byte // Read features - 1 byte
if (!this->readall_(buf, 1)) { if (!this->readall_(buf, 1)) {
this->log_socket_error_("reading features"); this->log_read_error_("features");
goto error; // NOLINT(cppcoreguidelines-avoid-goto) goto error; // NOLINT(cppcoreguidelines-avoid-goto)
} }
ota_features = buf[0]; // NOLINT ota_features = buf[0]; // NOLINT
@@ -280,7 +280,7 @@ void ESPHomeOTAComponent::handle_data_() {
// Read size, 4 bytes MSB first // Read size, 4 bytes MSB first
if (!this->readall_(buf, 4)) { if (!this->readall_(buf, 4)) {
ESP_LOGW(TAG, "Read size failed"); this->log_read_error_("size");
goto error; // NOLINT(cppcoreguidelines-avoid-goto) goto error; // NOLINT(cppcoreguidelines-avoid-goto)
} }
ota_size = 0; ota_size = 0;
@@ -312,7 +312,7 @@ void ESPHomeOTAComponent::handle_data_() {
// Read binary MD5, 32 bytes // Read binary MD5, 32 bytes
if (!this->readall_(buf, 32)) { if (!this->readall_(buf, 32)) {
ESP_LOGW(TAG, "Read MD5 checksum failed"); this->log_read_error_("MD5 checksum");
goto error; // NOLINT(cppcoreguidelines-avoid-goto) goto error; // NOLINT(cppcoreguidelines-avoid-goto)
} }
sbuf[32] = '\0'; sbuf[32] = '\0';
@@ -387,7 +387,7 @@ void ESPHomeOTAComponent::handle_data_() {
// Read ACK // Read ACK
if (!this->readall_(buf, 1) || buf[0] != ota::OTA_RESPONSE_OK) { if (!this->readall_(buf, 1) || buf[0] != ota::OTA_RESPONSE_OK) {
ESP_LOGW(TAG, "Read ack failed"); this->log_read_error_("ack");
// do not go to error, this is not fatal // do not go to error, this is not fatal
} }
@@ -481,6 +481,8 @@ void ESPHomeOTAComponent::set_port(uint16_t port) { this->port_ = port; }
void ESPHomeOTAComponent::log_socket_error_(const char *msg) { ESP_LOGW(TAG, "Socket %s: errno %d", msg, errno); } void ESPHomeOTAComponent::log_socket_error_(const char *msg) { ESP_LOGW(TAG, "Socket %s: errno %d", msg, errno); }
void ESPHomeOTAComponent::log_read_error_(const char *what) { ESP_LOGW(TAG, "Read %s failed", what); }
void ESPHomeOTAComponent::log_start_(const char *phase) { void ESPHomeOTAComponent::log_start_(const char *phase) {
ESP_LOGD(TAG, "Starting %s from %s", phase, this->client_->getpeername().c_str()); ESP_LOGD(TAG, "Starting %s from %s", phase, this->client_->getpeername().c_str());
} }

1
esphome/components/esphome/ota/ota_esphome.h
View File

@@ -32,6 +32,7 @@ class ESPHomeOTAComponent : public ota::OTAComponent {
bool readall_(uint8_t *buf, size_t len); bool readall_(uint8_t *buf, size_t len);
bool writeall_(const uint8_t *buf, size_t len); bool writeall_(const uint8_t *buf, size_t len);
void log_socket_error_(const char *msg); void log_socket_error_(const char *msg);
void log_read_error_(const char *what);
void log_start_(const char *phase); void log_start_(const char *phase);
void cleanup_connection_(); void cleanup_connection_();