From 4f40e2457a1f2d7c2e1cc8588cd224d1b5bb5ba4 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Mon, 6 May 2024 13:47:51 +0200 Subject: [PATCH] permanent enable IPv6 support --- .../src/framework/network/NetworkSettings.tsx | 13 ------------- interface/src/i18n/de/index.ts | 1 - interface/src/i18n/en/index.ts | 1 - interface/src/i18n/fr/index.ts | 1 - interface/src/i18n/it/index.ts | 1 - interface/src/i18n/nl/index.ts | 1 - interface/src/i18n/no/index.ts | 1 - interface/src/i18n/pl/index.ts | 1 - interface/src/i18n/sk/index.ts | 1 - interface/src/i18n/sv/index.ts | 1 - interface/src/i18n/tr/index.ts | 1 - interface/src/types/network.ts | 1 - lib/framework/NetworkSettingsService.cpp | 16 ++-------------- lib/framework/NetworkSettingsService.h | 1 - lib_standalone/ESP8266React.h | 1 - mock-api/rest_server.ts | 1 - src/system.cpp | 1 - test/standalone_file_export/emsesp_settings.json | 1 - 18 files changed, 2 insertions(+), 43 deletions(-) diff --git a/interface/src/framework/network/NetworkSettings.tsx b/interface/src/framework/network/NetworkSettings.tsx index ea2318f94..16d173f2b 100644 --- a/interface/src/framework/network/NetworkSettings.tsx +++ b/interface/src/framework/network/NetworkSettings.tsx @@ -86,7 +86,6 @@ const NetworkSettings: FC = () => { password: current_data ? current_data.password : '', hostname: current_data?.hostname, static_ip_config: false, - enableIPv6: false, bandwidth20: false, tx_power: 0, nosleep: false, @@ -290,18 +289,6 @@ const NetworkSettings: FC = () => { margin="normal" /> )} - {data.enableIPv6 !== undefined && ( - - } - label={LL.NETWORK_ENABLE_IPV6()} - /> - )} = 5 if (_state.ssid.length() == 0) { - ETH.enableIPv6(_state.enableIPv6); + ETH.enableIPv6(true); } #endif return; @@ -76,7 +76,7 @@ void NetworkSettingsService::manageSTA() { // Connect or reconnect as required if ((WiFi.getMode() & WIFI_STA) == 0) { #if ESP_IDF_VERSION_MAJOR >= 5 - WiFi.enableIPv6(_state.enableIPv6); + WiFi.enableIPv6(true); #endif if (_state.staticIPConfig) { WiFi.config(_state.localIP, _state.gatewayIP, _state.subnetMask, _state.dnsIP1, _state.dnsIP2); // configure for static IP @@ -358,17 +358,13 @@ void NetworkSettingsService::WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) setWiFiPowerOnRSSI(); } #if ESP_IDF_VERSION_MAJOR < 5 - if (_state.enableIPv6) { WiFi.enableIpV6(); - } #endif break; case ARDUINO_EVENT_ETH_CONNECTED: #if ESP_IDF_VERSION_MAJOR < 5 - if (_state.enableIPv6) { ETH.enableIpV6(); - } #endif break; @@ -406,9 +402,6 @@ void NetworkSettings::read(NetworkSettings & settings, JsonObject root) { root["enableCORS"] = settings.enableCORS; root["CORSOrigin"] = settings.CORSOrigin; root["tx_power"] = settings.tx_power; -#ifndef TASMOTA_SDK - root["enableIPv6"] = settings.enableIPv6; -#endif // extended settings JsonUtils::writeIP(root, "local_ip", settings.localIP); @@ -436,11 +429,6 @@ StateUpdateResult NetworkSettings::update(JsonObject root, NetworkSettings & set settings.enableMDNS = root["enableMDNS"] | true; settings.enableCORS = root["enableCORS"] | false; settings.CORSOrigin = root["CORSOrigin"] | "*"; -#ifdef TASMOTA_SDK - settings.enableIPv6 = true; -#else - settings.enableIPv6 = root["enableIPv6"] | false; -#endif // extended settings JsonUtils::readIP(root, "local_ip", settings.localIP); JsonUtils::readIP(root, "gateway_ip", settings.gatewayIP); diff --git a/lib/framework/NetworkSettingsService.h b/lib/framework/NetworkSettingsService.h index e27af0e01..4f9b8d16b 100644 --- a/lib/framework/NetworkSettingsService.h +++ b/lib/framework/NetworkSettingsService.h @@ -69,7 +69,6 @@ class NetworkSettings { String password; String hostname; bool staticIPConfig; - bool enableIPv6; bool bandwidth20; uint8_t tx_power; bool nosleep; diff --git a/lib_standalone/ESP8266React.h b/lib_standalone/ESP8266React.h index 6c11c7cdc..58e7354b0 100644 --- a/lib_standalone/ESP8266React.h +++ b/lib_standalone/ESP8266React.h @@ -67,7 +67,6 @@ class DummySettings { bool staticIPConfig = false; String dnsIP1 = ""; String dnsIP2 = ""; - bool enableIPv6 = false; bool enableMDNS = true; bool enableCORS = false; String CORSOrigin = "*"; diff --git a/mock-api/rest_server.ts b/mock-api/rest_server.ts index 99505053e..c4ffd5964 100644 --- a/mock-api/rest_server.ts +++ b/mock-api/rest_server.ts @@ -209,7 +209,6 @@ let network_settings = { enableMDNS: true, enableCORS: false, CORSOrigin: '*', - enableIPv6: false, local_ip: '', gateway_ip: '', subnet_mask: '', diff --git a/src/system.cpp b/src/system.cpp index aa76da654..ecaacbe1f 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -1315,7 +1315,6 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output } node["TxPower setting"] = settings.tx_power; node["static ip config"] = settings.staticIPConfig; - node["enable IPv6"] = settings.enableIPv6; node["low bandwidth"] = settings.bandwidth20; node["disable sleep"] = settings.nosleep; node["enable MDNS"] = settings.enableMDNS; diff --git a/test/standalone_file_export/emsesp_settings.json b/test/standalone_file_export/emsesp_settings.json index 988fe1bbe..8d8d69f63 100644 --- a/test/standalone_file_export/emsesp_settings.json +++ b/test/standalone_file_export/emsesp_settings.json @@ -9,7 +9,6 @@ "password": "fake", "hostname": "ems-esp", "static_ip_config": false, - "enableIPv6": false, "bandwidth20": false, "tx_power": 0, "nosleep": false,