Merge branch 'feature/sync_mdns_from_espidf' into 'master'

mdns: sync code from esp-idf

See merge request sdk/ESP8266_RTOS_SDK!943
This commit is contained in:
Dong Heng
2019-07-09 15:50:36 +08:00
13 changed files with 288 additions and 89 deletions

View File

@ -1,6 +1,6 @@
# The following five lines of boilerplate have to be in your project's
# CMakeLists in this exact order for cmake to work correctly
# The following lines of boilerplate have to be in your project's CMakeLists
# in this exact order for cmake to work correctly
cmake_minimum_required(VERSION 3.5)
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
project(mdns)
project(mdns-test)

View File

@ -1,3 +1,4 @@
set(COMPONENT_SRCS "mdns_example_main.c")
set(COMPONENT_ADD_INCLUDEDIRS ".")
register_component()

View File

@ -8,7 +8,7 @@ config WIFI_SSID
config WIFI_PASSWORD
string "WiFi Password"
default "myssid"
default "mypassword"
help
WiFi password (WPA or WPA2) for the example to use.
@ -26,4 +26,4 @@ config MDNS_INSTANCE
help
mDNS Instance Name for example to use
endmenu
endmenu

10
examples/protocols/mdns/main/mdns_example_main.c Executable file → Normal file
View File

@ -145,13 +145,13 @@ static void mdns_print_results(mdns_result_t * results){
if(r->txt_count){
printf(" TXT : [%u] ", r->txt_count);
for(t=0; t<r->txt_count; t++){
printf("%s=%s; ", r->txt[t].key, r->txt[t].value);
printf("%s=%s; ", r->txt[t].key, r->txt[t].value?r->txt[t].value:"NULL");
}
printf("\n");
}
a = r->addr;
while(a){
if(a->addr.type == MDNS_IP_PROTOCOL_V6){
if(a->addr.type == IPADDR_TYPE_V6){
printf(" AAAA: " IPV6STR "\n", IPV62STR(a->addr.u_addr.ip6));
} else {
printf(" A : " IPSTR "\n", IP2STR(&(a->addr.u_addr.ip4)));
@ -170,7 +170,7 @@ static void query_mdns_service(const char * service_name, const char * proto)
mdns_result_t * results = NULL;
esp_err_t err = mdns_query_ptr(service_name, proto, 3000, 20, &results);
if(err){
ESP_LOGE(TAG, "Query Failed");
ESP_LOGE(TAG, "Query Failed: %s", esp_err_to_name(err));
return;
}
if(!results){
@ -192,10 +192,10 @@ static void query_mdns_host(const char * host_name)
esp_err_t err = mdns_query_a(host_name, 2000, &addr);
if(err){
if(err == ESP_ERR_NOT_FOUND){
ESP_LOGW(TAG, "Host was not found!");
ESP_LOGW(TAG, "%s: Host was not found!", esp_err_to_name(err));
return;
}
ESP_LOGE(TAG, "Query Failed");
ESP_LOGE(TAG, "Query Failed: %s", esp_err_to_name(err));
return;
}