sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-18 17:53:47 +01:00
Code Issues Releases Wiki Activity

Merge branch 'fixed_vector_mdns_txt_records' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-13 19:07:01 -10:00
parent 6d5dcf109e fc30326e60
commit 2132427fe7
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
esphome/components/mdns/mdns_component.cpp
View File

@@ -83,7 +83,7 @@ void MDNSComponent::compile_records_(StaticVector<MDNSService, MDNS_SERVICE_COUN
#endif #endif
auto &txt_records = service.txt_records; auto &txt_records = service.txt_records;
txt_records.reserve(txt_count); txt_records.init(txt_count);
if (!friendly_name_empty) { if (!friendly_name_empty) {
txt_records.push_back({MDNS_STR(TXT_FRIENDLY_NAME), MDNS_STR(friendly_name.c_str())}); txt_records.push_back({MDNS_STR(TXT_FRIENDLY_NAME), MDNS_STR(friendly_name.c_str())});
@@ -171,12 +171,12 @@ void MDNSComponent::compile_records_(StaticVector<MDNSService, MDNS_SERVICE_COUN
fallback_service.service_type = MDNS_STR(SERVICE_HTTP); fallback_service.service_type = MDNS_STR(SERVICE_HTTP);
fallback_service.proto = MDNS_STR(SERVICE_TCP); fallback_service.proto = MDNS_STR(SERVICE_TCP);
fallback_service.port = USE_WEBSERVER_PORT; fallback_service.port = USE_WEBSERVER_PORT;
fallback_service.txt_records.push_back({MDNS_STR(TXT_VERSION), MDNS_STR(VALUE_VERSION)}); fallback_service.txt_records = {{MDNS_STR(TXT_VERSION), MDNS_STR(VALUE_VERSION)}};
#endif #endif
#ifdef USE_MDNS_STORE_SERVICES #ifdef USE_MDNS_STORE_SERVICES
// Copy to member variable if storage is enabled (verbose logging, OpenThread, or extra services) // Move to member variable if storage is enabled (verbose logging, OpenThread, or extra services)
this->services_ = services; this->services_ = std::move(services);
#endif #endif
} }

2
esphome/components/mdns/mdns_component.h
View File

@@ -38,7 +38,7 @@ struct MDNSService {
// as defined in RFC6763 Section 7, like "_tcp" or "_udp" // as defined in RFC6763 Section 7, like "_tcp" or "_udp"
const MDNSString *proto; const MDNSString *proto;
TemplatableValue<uint16_t> port; TemplatableValue<uint16_t> port;
std::vector<MDNSTXTRecord> txt_records; FixedVector<MDNSTXTRecord> txt_records;
}; };
class MDNSComponent : public Component { class MDNSComponent : public Component {

9
esphome/core/helpers.h
View File

@@ -200,6 +200,15 @@ template<typename T> class FixedVector {
public: public:
FixedVector() = default; FixedVector() = default;
/// Constructor from initializer list - allocates exact size needed
/// This enables brace initialization: FixedVector<int> v = {1, 2, 3};
FixedVector(std::initializer_list<T> init) {
init(init.size());
for (const auto &item : init) {
push_back(item);
}
}
~FixedVector() { cleanup_(); } ~FixedVector() { cleanup_(); }
// Disable copy operations (avoid accidental expensive copies) // Disable copy operations (avoid accidental expensive copies)