permanent enable IPv6 support

This commit is contained in:
MichaelDvP
2024-05-06 13:47:51 +02:00
parent fa6649d57e
commit 4f40e2457a
18 changed files with 2 additions and 43 deletions

View File

@@ -86,7 +86,6 @@ const NetworkSettings: FC = () => {
password: current_data ? current_data.password : '', password: current_data ? current_data.password : '',
hostname: current_data?.hostname, hostname: current_data?.hostname,
static_ip_config: false, static_ip_config: false,
enableIPv6: false,
bandwidth20: false, bandwidth20: false,
tx_power: 0, tx_power: 0,
nosleep: false, nosleep: false,
@@ -290,18 +289,6 @@ const NetworkSettings: FC = () => {
margin="normal" margin="normal"
/> />
)} )}
{data.enableIPv6 !== undefined && (
<BlockFormControlLabel
control={
<Checkbox
name="enableIPv6"
checked={data.enableIPv6}
onChange={updateFormValue}
/>
}
label={LL.NETWORK_ENABLE_IPV6()}
/>
)}
<BlockFormControlLabel <BlockFormControlLabel
control={ control={
<Checkbox <Checkbox

View File

@@ -278,7 +278,6 @@ const de: Translation = {
NETWORK_USE_DNS: 'Aktiviere mDNS Service', NETWORK_USE_DNS: 'Aktiviere mDNS Service',
NETWORK_ENABLE_CORS: 'Aktiviere CORS', NETWORK_ENABLE_CORS: 'Aktiviere CORS',
NETWORK_CORS_ORIGIN: 'CORS origin', NETWORK_CORS_ORIGIN: 'CORS origin',
NETWORK_ENABLE_IPV6: 'Aktiviere IPv6 Unterstützung',
NETWORK_FIXED_IP: 'Feste IP Adresse', NETWORK_FIXED_IP: 'Feste IP Adresse',
NETWORK_GATEWAY: 'Gateway', NETWORK_GATEWAY: 'Gateway',
NETWORK_SUBNET: 'Subnetz Maske', NETWORK_SUBNET: 'Subnetz Maske',

View File

@@ -278,7 +278,6 @@ const en: Translation = {
NETWORK_USE_DNS: 'Enable mDNS Service', NETWORK_USE_DNS: 'Enable mDNS Service',
NETWORK_ENABLE_CORS: 'Enable CORS', NETWORK_ENABLE_CORS: 'Enable CORS',
NETWORK_CORS_ORIGIN: 'CORS origin', NETWORK_CORS_ORIGIN: 'CORS origin',
NETWORK_ENABLE_IPV6: 'Enable IPv6 support',
NETWORK_FIXED_IP: 'Use Fixed IP address', NETWORK_FIXED_IP: 'Use Fixed IP address',
NETWORK_GATEWAY: 'Gateway', NETWORK_GATEWAY: 'Gateway',
NETWORK_SUBNET: 'Subnet Mask', NETWORK_SUBNET: 'Subnet Mask',

View File

@@ -278,7 +278,6 @@ const fr: Translation = {
NETWORK_USE_DNS: 'Activer le service mDNS', NETWORK_USE_DNS: 'Activer le service mDNS',
NETWORK_ENABLE_CORS: 'Activer CORS', NETWORK_ENABLE_CORS: 'Activer CORS',
NETWORK_CORS_ORIGIN: 'Origine CORS', NETWORK_CORS_ORIGIN: 'Origine CORS',
NETWORK_ENABLE_IPV6: "Activer le support de l'IPv6",
NETWORK_FIXED_IP: 'Utiliser une adresse IP fixe', NETWORK_FIXED_IP: 'Utiliser une adresse IP fixe',
NETWORK_GATEWAY: 'Passerelle', NETWORK_GATEWAY: 'Passerelle',
NETWORK_SUBNET: 'Masque de sous-réseau', NETWORK_SUBNET: 'Masque de sous-réseau',

View File

@@ -278,7 +278,6 @@ const it: Translation = {
NETWORK_USE_DNS: 'Abilita servizio mDNS', NETWORK_USE_DNS: 'Abilita servizio mDNS',
NETWORK_ENABLE_CORS: 'Abilita CORS', NETWORK_ENABLE_CORS: 'Abilita CORS',
NETWORK_CORS_ORIGIN: 'origine CORS', NETWORK_CORS_ORIGIN: 'origine CORS',
NETWORK_ENABLE_IPV6: 'Abilita supporto IPv6',
NETWORK_FIXED_IP: 'Usa indirizzo IP fisso', NETWORK_FIXED_IP: 'Usa indirizzo IP fisso',
NETWORK_GATEWAY: 'Gateway', NETWORK_GATEWAY: 'Gateway',
NETWORK_SUBNET: 'Maschera Sottorete', NETWORK_SUBNET: 'Maschera Sottorete',

View File

@@ -278,7 +278,6 @@ const nl: Translation = {
NETWORK_USE_DNS: 'Activeer mDNS Service', NETWORK_USE_DNS: 'Activeer mDNS Service',
NETWORK_ENABLE_CORS: 'Activeer CORS', NETWORK_ENABLE_CORS: 'Activeer CORS',
NETWORK_CORS_ORIGIN: 'CORS origin', NETWORK_CORS_ORIGIN: 'CORS origin',
NETWORK_ENABLE_IPV6: 'Activeer IPv6 support',
NETWORK_FIXED_IP: 'Gebruik vast IP addres', NETWORK_FIXED_IP: 'Gebruik vast IP addres',
NETWORK_GATEWAY: 'Gateway', NETWORK_GATEWAY: 'Gateway',
NETWORK_SUBNET: 'Subnetmasker', NETWORK_SUBNET: 'Subnetmasker',

View File

@@ -278,7 +278,6 @@ const no: Translation = {
NETWORK_USE_DNS: 'Aktiviser mDNS Service', NETWORK_USE_DNS: 'Aktiviser mDNS Service',
NETWORK_ENABLE_CORS: 'Aktiviser CORS', NETWORK_ENABLE_CORS: 'Aktiviser CORS',
NETWORK_CORS_ORIGIN: 'CORS origin', NETWORK_CORS_ORIGIN: 'CORS origin',
NETWORK_ENABLE_IPV6: 'Aktiviser IPv6 støtte',
NETWORK_FIXED_IP: 'Benytt statisk IP adresse', NETWORK_FIXED_IP: 'Benytt statisk IP adresse',
NETWORK_GATEWAY: 'Gateway', NETWORK_GATEWAY: 'Gateway',
NETWORK_SUBNET: 'Nettverksmaske', NETWORK_SUBNET: 'Nettverksmaske',

View File

@@ -278,7 +278,6 @@ const pl: BaseTranslation = {
NETWORK_USE_DNS: 'Włącz wsparcie dla mDNS', NETWORK_USE_DNS: 'Włącz wsparcie dla mDNS',
NETWORK_ENABLE_CORS: 'Włącz wsparcie dla CORS', NETWORK_ENABLE_CORS: 'Włącz wsparcie dla CORS',
NETWORK_CORS_ORIGIN: 'CORS Origin', NETWORK_CORS_ORIGIN: 'CORS Origin',
NETWORK_ENABLE_IPV6: 'Włącz wsparcie dla IPv6',
NETWORK_FIXED_IP: 'Użyj stałego adresu IP', NETWORK_FIXED_IP: 'Użyj stałego adresu IP',
NETWORK_GATEWAY: 'Brama', NETWORK_GATEWAY: 'Brama',
NETWORK_SUBNET: 'Maska podsieci', NETWORK_SUBNET: 'Maska podsieci',

View File

@@ -278,7 +278,6 @@ const sk: Translation = {
NETWORK_USE_DNS: 'Povoliť mDNS službu', NETWORK_USE_DNS: 'Povoliť mDNS službu',
NETWORK_ENABLE_CORS: 'Povoliť CORS', NETWORK_ENABLE_CORS: 'Povoliť CORS',
NETWORK_CORS_ORIGIN: 'CORS origin', NETWORK_CORS_ORIGIN: 'CORS origin',
NETWORK_ENABLE_IPV6: 'Povoliť podporu IPv6',
NETWORK_FIXED_IP: 'Použiť fixnú IP adresu', NETWORK_FIXED_IP: 'Použiť fixnú IP adresu',
NETWORK_GATEWAY: 'Brána', NETWORK_GATEWAY: 'Brána',
NETWORK_SUBNET: 'Maska podsiete', NETWORK_SUBNET: 'Maska podsiete',

View File

@@ -278,7 +278,6 @@ const sv: Translation = {
NETWORK_USE_DNS: 'Aktivera mDNS-tjänsten', NETWORK_USE_DNS: 'Aktivera mDNS-tjänsten',
NETWORK_ENABLE_CORS: 'Aktivera CORS', NETWORK_ENABLE_CORS: 'Aktivera CORS',
NETWORK_CORS_ORIGIN: 'CORS origin', NETWORK_CORS_ORIGIN: 'CORS origin',
NETWORK_ENABLE_IPV6: 'Aktivera IPv6-support',
NETWORK_FIXED_IP: 'Använd statiskt IP', NETWORK_FIXED_IP: 'Använd statiskt IP',
NETWORK_GATEWAY: 'Gateway', NETWORK_GATEWAY: 'Gateway',
NETWORK_SUBNET: 'Subnätmask', NETWORK_SUBNET: 'Subnätmask',

View File

@@ -278,7 +278,6 @@ const tr: Translation = {
NETWORK_USE_DNS: 'mDNS Servisini deveye al', NETWORK_USE_DNS: 'mDNS Servisini deveye al',
NETWORK_ENABLE_CORS: 'CORS u devreye al', NETWORK_ENABLE_CORS: 'CORS u devreye al',
NETWORK_CORS_ORIGIN: 'CORS kaynağı', NETWORK_CORS_ORIGIN: 'CORS kaynağı',
NETWORK_ENABLE_IPV6: 'IPv6 desteğini devreye al',
NETWORK_FIXED_IP: 'Sabit IP adresi kullan', NETWORK_FIXED_IP: 'Sabit IP adresi kullan',
NETWORK_GATEWAY: 'Aü geçidi', NETWORK_GATEWAY: 'Aü geçidi',
NETWORK_SUBNET: 'Ağ Alt Maskesi', NETWORK_SUBNET: 'Ağ Alt Maskesi',

View File

@@ -42,7 +42,6 @@ export interface NetworkSettingsType {
password: string; password: string;
hostname: string; hostname: string;
static_ip_config: boolean; static_ip_config: boolean;
enableIPv6?: boolean;
bandwidth20: boolean; bandwidth20: boolean;
nosleep: boolean; nosleep: boolean;
tx_power: number; tx_power: number;

View File

@@ -67,7 +67,7 @@ void NetworkSettingsService::manageSTA() {
if (WiFi.isConnected() || _state.ssid.length() == 0) { if (WiFi.isConnected() || _state.ssid.length() == 0) {
#if ESP_IDF_VERSION_MAJOR >= 5 #if ESP_IDF_VERSION_MAJOR >= 5
if (_state.ssid.length() == 0) { if (_state.ssid.length() == 0) {
ETH.enableIPv6(_state.enableIPv6); ETH.enableIPv6(true);
} }
#endif #endif
return; return;
@@ -76,7 +76,7 @@ void NetworkSettingsService::manageSTA() {
// Connect or reconnect as required // Connect or reconnect as required
if ((WiFi.getMode() & WIFI_STA) == 0) { if ((WiFi.getMode() & WIFI_STA) == 0) {
#if ESP_IDF_VERSION_MAJOR >= 5 #if ESP_IDF_VERSION_MAJOR >= 5
WiFi.enableIPv6(_state.enableIPv6); WiFi.enableIPv6(true);
#endif #endif
if (_state.staticIPConfig) { if (_state.staticIPConfig) {
WiFi.config(_state.localIP, _state.gatewayIP, _state.subnetMask, _state.dnsIP1, _state.dnsIP2); // configure for static IP 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(); setWiFiPowerOnRSSI();
} }
#if ESP_IDF_VERSION_MAJOR < 5 #if ESP_IDF_VERSION_MAJOR < 5
if (_state.enableIPv6) {
WiFi.enableIpV6(); WiFi.enableIpV6();
}
#endif #endif
break; break;
case ARDUINO_EVENT_ETH_CONNECTED: case ARDUINO_EVENT_ETH_CONNECTED:
#if ESP_IDF_VERSION_MAJOR < 5 #if ESP_IDF_VERSION_MAJOR < 5
if (_state.enableIPv6) {
ETH.enableIpV6(); ETH.enableIpV6();
}
#endif #endif
break; break;
@@ -406,9 +402,6 @@ void NetworkSettings::read(NetworkSettings & settings, JsonObject root) {
root["enableCORS"] = settings.enableCORS; root["enableCORS"] = settings.enableCORS;
root["CORSOrigin"] = settings.CORSOrigin; root["CORSOrigin"] = settings.CORSOrigin;
root["tx_power"] = settings.tx_power; root["tx_power"] = settings.tx_power;
#ifndef TASMOTA_SDK
root["enableIPv6"] = settings.enableIPv6;
#endif
// extended settings // extended settings
JsonUtils::writeIP(root, "local_ip", settings.localIP); JsonUtils::writeIP(root, "local_ip", settings.localIP);
@@ -436,11 +429,6 @@ StateUpdateResult NetworkSettings::update(JsonObject root, NetworkSettings & set
settings.enableMDNS = root["enableMDNS"] | true; settings.enableMDNS = root["enableMDNS"] | true;
settings.enableCORS = root["enableCORS"] | false; settings.enableCORS = root["enableCORS"] | false;
settings.CORSOrigin = root["CORSOrigin"] | "*"; settings.CORSOrigin = root["CORSOrigin"] | "*";
#ifdef TASMOTA_SDK
settings.enableIPv6 = true;
#else
settings.enableIPv6 = root["enableIPv6"] | false;
#endif
// extended settings // extended settings
JsonUtils::readIP(root, "local_ip", settings.localIP); JsonUtils::readIP(root, "local_ip", settings.localIP);
JsonUtils::readIP(root, "gateway_ip", settings.gatewayIP); JsonUtils::readIP(root, "gateway_ip", settings.gatewayIP);

View File

@@ -69,7 +69,6 @@ class NetworkSettings {
String password; String password;
String hostname; String hostname;
bool staticIPConfig; bool staticIPConfig;
bool enableIPv6;
bool bandwidth20; bool bandwidth20;
uint8_t tx_power; uint8_t tx_power;
bool nosleep; bool nosleep;

View File

@@ -67,7 +67,6 @@ class DummySettings {
bool staticIPConfig = false; bool staticIPConfig = false;
String dnsIP1 = ""; String dnsIP1 = "";
String dnsIP2 = ""; String dnsIP2 = "";
bool enableIPv6 = false;
bool enableMDNS = true; bool enableMDNS = true;
bool enableCORS = false; bool enableCORS = false;
String CORSOrigin = "*"; String CORSOrigin = "*";

View File

@@ -209,7 +209,6 @@ let network_settings = {
enableMDNS: true, enableMDNS: true,
enableCORS: false, enableCORS: false,
CORSOrigin: '*', CORSOrigin: '*',
enableIPv6: false,
local_ip: '', local_ip: '',
gateway_ip: '', gateway_ip: '',
subnet_mask: '', subnet_mask: '',

View File

@@ -1315,7 +1315,6 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output
} }
node["TxPower setting"] = settings.tx_power; node["TxPower setting"] = settings.tx_power;
node["static ip config"] = settings.staticIPConfig; node["static ip config"] = settings.staticIPConfig;
node["enable IPv6"] = settings.enableIPv6;
node["low bandwidth"] = settings.bandwidth20; node["low bandwidth"] = settings.bandwidth20;
node["disable sleep"] = settings.nosleep; node["disable sleep"] = settings.nosleep;
node["enable MDNS"] = settings.enableMDNS; node["enable MDNS"] = settings.enableMDNS;

View File

@@ -9,7 +9,6 @@
"password": "fake", "password": "fake",
"hostname": "ems-esp", "hostname": "ems-esp",
"static_ip_config": false, "static_ip_config": false,
"enableIPv6": false,
"bandwidth20": false, "bandwidth20": false,
"tx_power": 0, "tx_power": 0,
"nosleep": false, "nosleep": false,