github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-10-07 03:16:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
J. Nick Koston
2026-01-02 20:28:37 -10:00
parent c2c513fd75
commit c2ffd4e49a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/api/api_connection.cpp
+1 -1
View File
@@ -1524,7 +1524,7 @@ void APIConnection::complete_authentication_() {
bool APIConnection::send_hello_response(const HelloRequest &msg) { bool APIConnection::send_hello_response(const HelloRequest &msg) {
// Copy client name with truncation if needed (set_client_name handles truncation) // Copy client name with truncation if needed (set_client_name handles truncation)
this->helper_->set_client_name(reinterpret_cast<const char *>(msg.client_info), msg.client_info_len); this->helper_->set_client_name(msg.client_info.data(), msg.client_info.size());
this->client_api_version_major_ = msg.api_version_major; this->client_api_version_major_ = msg.api_version_major;
this->client_api_version_minor_ = msg.api_version_minor; this->client_api_version_minor_ = msg.api_version_minor;
char peername[socket::PEERNAME_MAX_LEN]; char peername[socket::PEERNAME_MAX_LEN];