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

optimize

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-26 22:05:06 -05:00
parent 10c5a19503
commit a08a99e3f4
2 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -174,8 +174,7 @@ void ESPHomeOTAComponent::handle_handshake_() {
} }
// Magic bytes valid, move to next state // Magic bytes valid, move to next state
this->ota_state_ = OTAState::MAGIC_ACK; this->transition_ota_state_(OTAState::MAGIC_ACK);
this->handshake_buf_pos_ = 0; // Reset for reuse
continue; continue;
} }
@@ -187,27 +186,13 @@ void ESPHomeOTAComponent::handle_handshake_() {
this->handshake_buf_[1] = USE_OTA_VERSION; this->handshake_buf_[1] = USE_OTA_VERSION;
} }
// Write remaining bytes (2 total) if (!this->try_write_(2, LOG_STR("writing magic ack"))) {
size_t bytes_to_write = 2 - this->handshake_buf_pos_;
ssize_t written = this->client_->write(this->handshake_buf_ + this->handshake_buf_pos_, bytes_to_write);
if (written == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) {
return; // Try again next loop
}
this->log_socket_error_(LOG_STR("writing magic ack"));
this->cleanup_connection_();
return; return;
} }
this->handshake_buf_pos_ += written;
if (this->handshake_buf_pos_ != 2) {
return;
}
// All bytes sent, create backend and move to next state // All bytes sent, create backend and move to next state
this->backend_ = ota::make_ota_backend(); this->backend_ = ota::make_ota_backend();
this->ota_state_ = OTAState::FEATURE_READ; this->transition_ota_state_(OTAState::FEATURE_READ);
this->handshake_buf_pos_ = 0; // Reset for reuse
continue; continue;
} }
@@ -219,30 +204,26 @@ void ESPHomeOTAComponent::handle_handshake_() {
this->ota_features_ = this->handshake_buf_[0]; this->ota_features_ = this->handshake_buf_[0];
ESP_LOGV(TAG, "Features: 0x%02X", this->ota_features_); ESP_LOGV(TAG, "Features: 0x%02X", this->ota_features_);
this->ota_state_ = OTAState::FEATURE_ACK; this->transition_ota_state_(OTAState::FEATURE_ACK);
this->handshake_buf_pos_ = 0; // Reset for reuse
continue; continue;
} }
case OTAState::FEATURE_ACK: { case OTAState::FEATURE_ACK: {
// Acknowledge header - 1 byte // Acknowledge header - 1 byte
uint8_t ack = // Prepare response in handshake buffer if not already done
((this->ota_features_ & FEATURE_SUPPORTS_COMPRESSION) != 0 && this->backend_->supports_compression()) if (this->handshake_buf_pos_ == 0) {
? ota::OTA_RESPONSE_SUPPORTS_COMPRESSION this->handshake_buf_[0] =
: ota::OTA_RESPONSE_HEADER_OK; ((this->ota_features_ & FEATURE_SUPPORTS_COMPRESSION) != 0 && this->backend_->supports_compression())
? ota::OTA_RESPONSE_SUPPORTS_COMPRESSION
: ota::OTA_RESPONSE_HEADER_OK;
}
ssize_t written = this->client_->write(&ack, 1); if (!this->try_write_(1, LOG_STR("writing feature ack"))) {
if (written == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) {
return; // Try again next loop
}
this->log_socket_error_(LOG_STR("writing feature ack"));
this->cleanup_connection_();
return; return;
} }
// Handshake complete, move to data phase // Handshake complete, move to data phase
this->ota_state_ = OTAState::DATA; this->transition_ota_state_(OTAState::DATA);
continue; continue;
} }
@@ -583,6 +564,30 @@ bool ESPHomeOTAComponent::try_read_(size_t to_read, const LogString *error_desc,
return this->handshake_buf_pos_ >= to_read; return this->handshake_buf_pos_ >= to_read;
} }
bool ESPHomeOTAComponent::try_write_(size_t to_write, const LogString *error_desc) {
// Write bytes from handshake buffer, starting at handshake_buf_pos_
size_t bytes_to_write = to_write - this->handshake_buf_pos_;
ssize_t written = this->client_->write(this->handshake_buf_ + this->handshake_buf_pos_, bytes_to_write);
if (written == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) {
return false; // Try again next loop
}
this->log_socket_error_(error_desc);
this->cleanup_connection_();
return false;
}
this->handshake_buf_pos_ += written;
// Return true only if we have written all the requested bytes
return this->handshake_buf_pos_ >= to_write;
}
void ESPHomeOTAComponent::transition_ota_state_(OTAState next_state) {
this->ota_state_ = next_state;
this->handshake_buf_pos_ = 0; // Reset buffer position for next state
}
void ESPHomeOTAComponent::cleanup_connection_() { void ESPHomeOTAComponent::cleanup_connection_() {
this->client_->close(); this->client_->close();
this->client_ = nullptr; this->client_ = nullptr;

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

@@ -48,6 +48,8 @@ class ESPHomeOTAComponent : public ota::OTAComponent {
bool writeall_(const uint8_t *buf, size_t len); bool writeall_(const uint8_t *buf, size_t len);
bool try_read_(size_t to_read, const LogString *error_desc, const LogString *close_desc); bool try_read_(size_t to_read, const LogString *error_desc, const LogString *close_desc);
bool try_write_(size_t to_write, const LogString *error_desc);
void transition_ota_state_(OTAState next_state);
void log_socket_error_(const LogString *msg); void log_socket_error_(const LogString *msg);
void log_read_error_(const LogString *what); void log_read_error_(const LogString *what);