Merge branch 'bugfix/mdns_any_type_share_v3.1' into 'release/v3.1'

mdns: Fix a portion of the queries are issued with the wildcard query type (backport v3.1)

See merge request idf/esp-idf!3008
This commit is contained in:
Ivan Grokhotkov 2018-08-15 06:40:24 +08:00
commit 53509c7bfd

View file

@ -1180,7 +1180,7 @@ static void _mdns_create_answer_from_parsed_packet(mdns_parsed_packet_t * parsed
}
if (service) {
if (q->type == MDNS_TYPE_PTR || q->type == MDNS_TYPE_ANY) {
if (q->type == MDNS_TYPE_PTR) {
if (q->type == MDNS_TYPE_PTR || !parsed_packet->probe) {
shared = true;
}
if (!_mdns_alloc_answer(&packet->answers, MDNS_TYPE_PTR, service->service, false, false)
@ -2555,7 +2555,7 @@ void mdns_parse_packet(mdns_rx_packet_t * packet)
continue;
}
if (type == MDNS_TYPE_ANY) {
if (type == MDNS_TYPE_ANY && !_str_null_or_empty(name->host)) {
parsed_packet->probe = true;
}