From fca4512370023c3e7a64630ba78900519fd7aac2 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Mon, 24 Nov 2025 15:28:38 -0600 Subject: [PATCH 1/2] [mdns] Extract common Arduino mDNS registration to shared header --- esphome/components/mdns/mdns_libretiny.cpp | 34 ++-------------------- esphome/components/mdns/mdns_rp2040.cpp | 34 ++-------------------- 2 files changed, 6 insertions(+), 62 deletions(-) diff --git a/esphome/components/mdns/mdns_libretiny.cpp b/esphome/components/mdns/mdns_libretiny.cpp index 986099fa1f..7b104ed2d7 100644 --- a/esphome/components/mdns/mdns_libretiny.cpp +++ b/esphome/components/mdns/mdns_libretiny.cpp @@ -1,41 +1,13 @@ #include "esphome/core/defines.h" #if defined(USE_LIBRETINY) && defined(USE_MDNS) -#include "esphome/components/network/ip_address.h" -#include "esphome/components/network/util.h" -#include "esphome/core/application.h" -#include "esphome/core/log.h" -#include "mdns_component.h" - #include +#include "mdns_arduino.h" + namespace esphome::mdns { -static void register_libretiny(MDNSComponent *, StaticVector &services) { - MDNS.begin(App.get_name().c_str()); - - for (const auto &service : services) { - // Strip the leading underscore from the proto and service_type. While it is - // part of the wire protocol to have an underscore, and for example ESP-IDF - // expects the underscore to be there, the ESP8266 implementation always adds - // the underscore itself. - auto *proto = MDNS_STR_ARG(service.proto); - while (*proto == '_') { - proto++; - } - auto *service_type = MDNS_STR_ARG(service.service_type); - while (*service_type == '_') { - service_type++; - } - uint16_t port_ = const_cast &>(service.port).value(); - MDNS.addService(service_type, proto, port_); - for (const auto &record : service.txt_records) { - MDNS.addServiceTxt(service_type, proto, MDNS_STR_ARG(record.key), MDNS_STR_ARG(record.value)); - } - } -} - -void MDNSComponent::setup() { this->setup_buffers_and_register_(register_libretiny); } +void MDNSComponent::setup() { this->setup_buffers_and_register_(register_arduino_mdns); } void MDNSComponent::on_shutdown() {} diff --git a/esphome/components/mdns/mdns_rp2040.cpp b/esphome/components/mdns/mdns_rp2040.cpp index e4a9b60cdb..59688e7b36 100644 --- a/esphome/components/mdns/mdns_rp2040.cpp +++ b/esphome/components/mdns/mdns_rp2040.cpp @@ -1,41 +1,13 @@ #include "esphome/core/defines.h" #if defined(USE_RP2040) && defined(USE_MDNS) -#include "esphome/components/network/ip_address.h" -#include "esphome/components/network/util.h" -#include "esphome/core/application.h" -#include "esphome/core/log.h" -#include "mdns_component.h" - #include +#include "mdns_arduino.h" + namespace esphome::mdns { -static void register_rp2040(MDNSComponent *, StaticVector &services) { - MDNS.begin(App.get_name().c_str()); - - for (const auto &service : services) { - // Strip the leading underscore from the proto and service_type. While it is - // part of the wire protocol to have an underscore, and for example ESP-IDF - // expects the underscore to be there, the ESP8266 implementation always adds - // the underscore itself. - auto *proto = MDNS_STR_ARG(service.proto); - while (*proto == '_') { - proto++; - } - auto *service_type = MDNS_STR_ARG(service.service_type); - while (*service_type == '_') { - service_type++; - } - uint16_t port = const_cast &>(service.port).value(); - MDNS.addService(service_type, proto, port); - for (const auto &record : service.txt_records) { - MDNS.addServiceTxt(service_type, proto, MDNS_STR_ARG(record.key), MDNS_STR_ARG(record.value)); - } - } -} - -void MDNSComponent::setup() { this->setup_buffers_and_register_(register_rp2040); } +void MDNSComponent::setup() { this->setup_buffers_and_register_(register_arduino_mdns); } void MDNSComponent::loop() { MDNS.update(); } From 03767474b728c811785d0fb1181ab59045c7e210 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Mon, 24 Nov 2025 15:28:45 -0600 Subject: [PATCH 2/2] [mdns] Extract common Arduino mDNS registration to shared header --- esphome/components/mdns/mdns_arduino.h | 42 ++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 esphome/components/mdns/mdns_arduino.h diff --git a/esphome/components/mdns/mdns_arduino.h b/esphome/components/mdns/mdns_arduino.h new file mode 100644 index 0000000000..8d72c86f5c --- /dev/null +++ b/esphome/components/mdns/mdns_arduino.h @@ -0,0 +1,42 @@ +#pragma once +#include "esphome/core/defines.h" + +// Common Arduino mDNS registration for RP2040 and LibreTiny +#if defined(USE_MDNS) && (defined(USE_RP2040) || defined(USE_LIBRETINY)) + +#include "esphome/core/application.h" +#include "mdns_component.h" + +namespace esphome::mdns { + +/// Register mDNS services using Arduino-style mDNS library (RP2040/LibreTiny) +/// @param services The services to register +inline void register_arduino_mdns(MDNSComponent *, StaticVector &services) { + MDNS.begin(App.get_name().c_str()); + + for (const auto &service : services) { + // Strip the leading underscore from the proto and service_type. While it is + // part of the wire protocol to have an underscore, and for example ESP-IDF + // expects the underscore to be there, the RP2040/LibreTiny mDNS + // implementations always add the underscore themselves. + auto *proto = MDNS_STR_ARG(service.proto); + while (*proto == '_') { + proto++; + } + + auto *service_type = MDNS_STR_ARG(service.service_type); + while (*service_type == '_') { + service_type++; + } + + uint16_t port = const_cast &>(service.port).value(); + MDNS.addService(service_type, proto, port); + for (const auto &record : service.txt_records) { + MDNS.addServiceTxt(service_type, proto, MDNS_STR_ARG(record.key), MDNS_STR_ARG(record.value)); + } + } +} + +} // namespace esphome::mdns + +#endif