espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-07-19 21:42:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

mdns: Stabilization of mdns test app

Browse Source 
* Original commit: espressif/esp-idf@93a902ba80
This commit is contained in:
gabsuren
2021-12-17 17:49:48 +04:00
committed by suren-gabrielyan-espressif
parent ec491ec536
commit d39a4c744e
3 changed files with 78 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
tools/test_apps/protocols/mdns/main/mdns_test.c
View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -9,6 +9,7 @@
#include "esp_netif.h"
static const char * TAG = "MDNS_TEST_APP";
static const int RETRY_COUNT = 10;
static void mdns_print_results(mdns_result_t *results)
{
@ -51,7 +52,7 @@ static bool check_and_print_result(mdns_search_once_t *search)
}
if (!result) { // search timeout, but no result
return true;
return false;
}
// If yes, print the result
@ -69,9 +70,10 @@ static bool check_and_print_result(mdns_search_once_t *search)
return true;
}
static void query_mdns_hosts_async(const char * host_name)
static bool query_mdns_hosts_async(const char * host_name)
{
ESP_LOGI(TAG, "Query both A and AAA: %s.local", host_name);
bool res = false;
mdns_search_once_t *s_a = mdns_query_async_new(host_name, NULL, NULL, MDNS_TYPE_A, 1000, 1, NULL);
mdns_query_async_delete(s_a);
@ -81,16 +83,19 @@ static void query_mdns_hosts_async(const char * host_name)
ESP_LOGI(TAG, "Query A %s.local finished", host_name);
mdns_query_async_delete(s_a);
s_a = NULL;
res = true;
}
if (s_aaaa && check_and_print_result(s_aaaa)) {
ESP_LOGI(TAG, "Query AAAA %s.local finished", host_name);
mdns_query_async_delete(s_aaaa);
s_aaaa = NULL;
res = true;
}
}
return res;
}
static void query_mdns_host(const char * host_name)
static esp_err_t query_mdns_host(const char * host_name)
{
ESP_LOGI(TAG, "Query A: %s.local", host_name);
@ -101,16 +106,16 @@ static void query_mdns_host(const char * host_name)
if(err){
if(err == ESP_ERR_NOT_FOUND){
ESP_LOGW(TAG, "%s: Host was not found!", esp_err_to_name(err));
return;
}
ESP_LOGE(TAG, "Query Failed: %s", esp_err_to_name(err));
return;
return err;
}
ESP_LOGI(TAG, "Query A: %s.local resolved to: " IPSTR, host_name, IP2STR(&addr));
return ESP_OK;
}
static void query_mdns_service(const char * instance, const char * service_name, const char * proto)
static esp_err_t query_mdns_service(const char * instance, const char * service_name, const char * proto)
{
ESP_LOGI(TAG, "Query SRV: %s.%s.local", service_name, proto);
@ -118,15 +123,15 @@ static void query_mdns_service(const char * instance, const char * service_name,
esp_err_t err = mdns_query_srv(instance, service_name, proto, 3000, &results);
if(err){
ESP_LOGE(TAG, "Query Failed: %s", esp_err_to_name(err));
return;
return err;
}
if(!results){
ESP_LOGW(TAG, "No results found!");
return;
}
mdns_print_results(results);
mdns_query_results_free(results);
return ESP_OK;
}
void query_mdns_service_sub_type(const char * subtype, const char * service_name, const char * proto) {
@ -136,11 +141,9 @@ void query_mdns_service_sub_type(const char * subtype, const char * service_name
esp_err_t err = mdns_query_ptr(service_name, proto, 3000, 20, &results);
if(err){
ESP_LOGE(TAG, "Query Failed: %s", esp_err_to_name(err));
return;
}
if(!results){
ESP_LOGW(TAG, "No results found!");
return;
}
mdns_print_results(results);
@ -150,16 +153,33 @@ void query_mdns_service_sub_type(const char * subtype, const char * service_name
void mdns_test(const char *line)
{
char test_case[32];
int i = 0;
const TickType_t xDelay = 1000 / portTICK_PERIOD_MS;
sscanf(line, "%s", test_case);
ESP_LOGI(TAG, "test case = %s", test_case);
if (strcmp(test_case, "CONFIG_TEST_QUERY_HOST") == 0) {
query_mdns_host("tinytester");
i = 0;
while (query_mdns_host("tinytester") != ESP_OK && i != RETRY_COUNT) {
query_mdns_host("tinytester");
i++;
vTaskDelay(xDelay);
}
} else if (strcmp(test_case, "CONFIG_TEST_QUERY_HOST_ASYNC") == 0) {
query_mdns_hosts_async("tinytester");
i = 0;
while (query_mdns_hosts_async("tinytester") == false && i != RETRY_COUNT) {
query_mdns_hosts_async("tinytester");
i++;
vTaskDelay(xDelay);
}
} else if (strcmp(test_case, "CONFIG_TEST_QUERY_SERVICE") == 0) {
query_mdns_service("ESP32", "_http", "_tcp");
i = 0;
while (query_mdns_service("ESP32", "_http", "_tcp") != ESP_OK && i != RETRY_COUNT) {
query_mdns_service("ESP32", "_http", "_tcp");
i++;
vTaskDelay(xDelay);
}
} else {
ESP_LOGE(TAG, "%s: No such test case", test_case);
}