Merge branch 'master' into feature/esp32s2beta_merge

examples/protocols/http_server/restful_server/README.md

@@ -108,6 +108,8 @@ openocd-esp32/bin/openocd -s openocd-esp32/share/openocd/scripts -f interface/ft
 
 In your browser, enter the URL where the website located (e.g. `http://esp-home.local`). You can also enter the IP address that ESP32 obtained if your operating system currently don't have support for mDNS service.
 
+Besides that, this example also enables the NetBIOS feature with the domain name `esp-home`. If your OS supports NetBIOS and has enabled it (e.g. Windows has native support for NetBIOS), then the URL `http://esp-home` should also work.
+
 ![esp_home_local](https://dl.espressif.com/dl/esp-idf/docs/_static/esp_home_local.gif)
 
 ### ESP monitor output

examples/protocols/http_server/restful_server/main/esp_rest_main.c

@@ -6,6 +6,7 @@
    software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
    CONDITIONS OF ANY KIND, either express or implied.
 */
+#include "sdkconfig.h"
 #include "driver/sdmmc_host.h"
 #include "driver/gpio.h"
 #include "esp_vfs_semihost.h"
@@ -17,8 +18,8 @@
 #include "esp_event.h"
 #include "esp_log.h"
 #include "mdns.h"
+#include "lwip/apps/netbiosns.h"
 #include "protocol_examples_common.h"
-#include "sdkconfig.h"
 
 #define MDNS_INSTANCE "esp home web server"
 
@@ -126,6 +127,8 @@ void app_main(void)
     tcpip_adapter_init();
     ESP_ERROR_CHECK(esp_event_loop_create_default());
     initialise_mdns();
+    netbiosns_init();
+    netbiosns_set_name(CONFIG_EXAMPLE_MDNS_HOST_NAME);
 
     ESP_ERROR_CHECK(example_connect());
     ESP_ERROR_CHECK(init_fs());