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
espressif · Aug 14, 2018 · 53509c7 · 53509c7
2 parents 39dd71d + 1bbe953
commit 53509c7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/components/mdns/mdns.c b/components/mdns/mdns.c
@@ -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;
             }