scratch/esphome
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

[ethernet_info] Eliminate heap allocations in DNS text sensor (#12756)

Browse Source
This commit is contained in:
J. Nick Koston
2025-12-30 10:25:51 -10:00
committed by GitHub
parent 96c47f3b4d
commit dae7ba604a
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
esphome/components/ethernet_info/ethernet_info_text_sensor.cpp
View File

@@ -3,8 +3,7 @@
#ifdef USE_ESP32
namespace esphome {
namespace ethernet_info {
namespace esphome::ethernet_info {
static const char *const TAG = "ethernet_info";
@@ -12,7 +11,6 @@ void IPAddressEthernetInfo::dump_config() { LOG_TEXT_SENSOR("", "EthernetInfo IP
void DNSAddressEthernetInfo::dump_config() { LOG_TEXT_SENSOR("", "EthernetInfo DNS Address", this); }
void MACAddressEthernetInfo::dump_config() { LOG_TEXT_SENSOR("", "EthernetInfo MAC Address", this); }
} // namespace ethernet_info
} // namespace esphome
} // namespace esphome::ethernet_info
#endif // USE_ESP32

28
esphome/components/ethernet_info/ethernet_info_text_sensor.h
View File

@@ -6,8 +6,7 @@
#ifdef USE_ESP32
namespace esphome {
namespace ethernet_info {
namespace esphome::ethernet_info {
class IPAddressEthernetInfo : public PollingComponent, public text_sensor::TextSensor {
public:
@@ -40,21 +39,27 @@ class IPAddressEthernetInfo : public PollingComponent, public text_sensor::TextS
class DNSAddressEthernetInfo : public PollingComponent, public text_sensor::TextSensor {
public:
void update() override {
auto dns_one = ethernet::global_eth_component->get_dns_address(0);
auto dns_two = ethernet::global_eth_component->get_dns_address(1);
auto dns1 = ethernet::global_eth_component->get_dns_address(0);
auto dns2 = ethernet::global_eth_component->get_dns_address(1);
std::string dns_results = dns_one.str() + " " + dns_two.str();
if (dns_results != this->last_results_) {
this->last_results_ = dns_results;
this->publish_state(dns_results);
if (dns1 != this->last_dns1_ || dns2 != this->last_dns2_) {
this->last_dns1_ = dns1;
this->last_dns2_ = dns2;
// IP_ADDRESS_BUFFER_SIZE (40) = max IP (39) + null; space reuses first null's slot
char buf[network::IP_ADDRESS_BUFFER_SIZE * 2];
dns1.str_to(buf);
size_t len1 = strlen(buf);
buf[len1] = ' ';
dns2.str_to(buf + len1 + 1);
this->publish_state(buf);
}
}
float get_setup_priority() const override { return setup_priority::ETHERNET; }
void dump_config() override;
protected:
std::string last_results_;
network::IPAddress last_dns1_;
network::IPAddress last_dns2_;
};
class MACAddressEthernetInfo : public Component, public text_sensor::TextSensor {
@@ -64,7 +69,6 @@ class MACAddressEthernetInfo : public Component, public text_sensor::TextSensor
void dump_config() override;
};
} // namespace ethernet_info
} // namespace esphome
} // namespace esphome::ethernet_info
#endif // USE_ESP32