From ff045b1a0173135c4f032eca0e5328238c7b951f Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Wed, 28 Feb 2024 12:40:27 +0100 Subject: [PATCH] back to platform 2024.01.01, show dns ipv6 in right format --- lib/framework/NetworkStatus.cpp | 17 +++++++++++++++-- platformio.ini | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/framework/NetworkStatus.cpp b/lib/framework/NetworkStatus.cpp index 27c37cee7..bccdcf20a 100644 --- a/lib/framework/NetworkStatus.cpp +++ b/lib/framework/NetworkStatus.cpp @@ -1,6 +1,9 @@ #include "NetworkStatus.h" #include "../../src/emsesp_stub.hpp" +#ifdef TASMOTA_SDK +#include "lwip/dns.h" +#endif NetworkStatus::NetworkStatus(AsyncWebServer * server, SecurityManager * securityManager) { server->on(NETWORK_STATUS_SERVICE_PATH, @@ -32,8 +35,13 @@ void NetworkStatus::networkStatus(AsyncWebServerRequest * request) { root["mac_address"] = ETH.macAddress(); root["subnet_mask"] = ETH.subnetMask().toString(); root["gateway_ip"] = ETH.gatewayIP().toString(); - IPAddress dnsIP1 = ETH.dnsIP(0); - IPAddress dnsIP2 = ETH.dnsIP(1); +#ifdef TASMOTA_SDK + IPAddress dnsIP1 = IPAddress(dns_getserver(0)); + IPAddress dnsIP2 = IPAddress(dns_getserver(1)); +#else + IPAddress dnsIP1 = ETH.dnsIP(0); + IPAddress dnsIP2 = ETH.dnsIP(1); +#endif if (IPUtils::isSet(dnsIP1)) { root["dns_ip_1"] = dnsIP1.toString(); } @@ -54,8 +62,13 @@ void NetworkStatus::networkStatus(AsyncWebServerRequest * request) { root["gateway_ip"] = WiFi.gatewayIP().toString(); } +#ifdef TASMOTA_SDK + IPAddress dnsIP1 = IPAddress(dns_getserver(0)); + IPAddress dnsIP2 = IPAddress(dns_getserver(1)); +#else IPAddress dnsIP1 = WiFi.dnsIP(0); IPAddress dnsIP2 = WiFi.dnsIP(1); +#endif if (dnsIP1 != INADDR_NONE) { root["dns_ip_1"] = dnsIP1.toString(); } diff --git a/platformio.ini b/platformio.ini index f7533a727..a61fb66ef 100644 --- a/platformio.ini +++ b/platformio.ini @@ -50,7 +50,7 @@ extra_scripts = [espressi32_base_tasmota] ; use Tasmota's library which removes some unused libs (like mbedtsl, so no WiFi_secure.h) and increases available heap ; Tasmota Arduino Core 2.0.14 with IPv6 support, based on IDF 4.4.6 -platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.01.00/platform-espressif32.zip +platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.01.01/platform-espressif32.zip ; Tasmota Arduino Core 3.0.0-alpha based on IDF v5.1.2 ; platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.02.10/platform-espressif32.zip framework = arduino