espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-12-04 16:19:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(mdns): Fix to keep TXT/SRV in answers to queries

Browse Source 
unlike discoveries, where they need to stay in additional section
Quick fix of regression b7b8c5dbd7
This commit is contained in:
David Cermak
2025-12-03 11:57:31 +01:00
parent 6c2c2cd22b
commit 0f6235f13e
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
components/mdns/mdns_send.c
View File

@@ -257,9 +257,20 @@ static bool create_answer_from_service(mdns_tx_packet_t *packet, mdns_service_t
{ {
mdns_host_item_t *host = get_host_item(service->hostname); mdns_host_item_t *host = get_host_item(service->hostname);
bool is_delegated = (host != mdns_priv_get_self_host()); bool is_delegated = (host != mdns_priv_get_self_host());
if (question->type == MDNS_TYPE_PTR || question->type == MDNS_TYPE_ANY) { bool is_instance_question = !mdns_utils_str_null_or_empty(question->host);
// According to RFC6763-section12.1, for DNS-SD, SRV, TXT and all address records if ((question->type == MDNS_TYPE_ANY) && is_instance_question) {
// should be included in additional records. // Instance-scoped ANY queries expect the resolved data (SRV/TXT) to be
// part of the answer section so that queriers can stop searching as soon
// as they receive this packet (RFC6762 section 6, RFC6763 section 12.1).
if (!mdns_priv_create_answer(&packet->answers, MDNS_TYPE_SRV, service, NULL, send_flush, false) ||
!mdns_priv_create_answer(&packet->answers, MDNS_TYPE_TXT, service, NULL, send_flush, false) ||
!mdns_priv_create_answer(&packet->additional, MDNS_TYPE_A, service, host, send_flush, false) ||
!mdns_priv_create_answer(&packet->additional, MDNS_TYPE_AAAA, service, host, send_flush, false)) {
return false;
}
} else if (question->type == MDNS_TYPE_PTR || (question->type == MDNS_TYPE_ANY && !is_instance_question)) {
// For service discovery (PTR or wildcard ANY) RFC6763 section 12.1
// requires SRV/TXT/address records to stay in the additional section.
if (!mdns_priv_create_answer(&packet->answers, MDNS_TYPE_PTR, service, NULL, false, false) || if (!mdns_priv_create_answer(&packet->answers, MDNS_TYPE_PTR, service, NULL, false, false) ||
!mdns_priv_create_answer(&packet->additional, MDNS_TYPE_SRV, service, NULL, send_flush, false) || !mdns_priv_create_answer(&packet->additional, MDNS_TYPE_SRV, service, NULL, send_flush, false) ||
!mdns_priv_create_answer(&packet->additional, MDNS_TYPE_TXT, service, NULL, send_flush, false) || !mdns_priv_create_answer(&packet->additional, MDNS_TYPE_TXT, service, NULL, send_flush, false) ||