diff options
| author | Joakim Hulthe <joakim.hulthe@mullvad.net> | 2024-08-13 12:43:41 +0200 |
|---|---|---|
| committer | Joakim Hulthe <joakim.hulthe@mullvad.net> | 2024-09-17 11:29:25 +0200 |
| commit | 3373ca2c3f0df02da4ade50815f5654bc5dd7abf (patch) | |
| tree | 656daf4ad44ceafd43048755d8e0e7523cd5645f | |
| parent | fb92bf539e21542989c5bd31142b265f33812e0d (diff) | |
| download | mullvadvpn-3373ca2c3f0df02da4ade50815f5654bc5dd7abf.tar.xz mullvadvpn-3373ca2c3f0df02da4ade50815f5654bc5dd7abf.zip | |
Add `use_anywhere` feature indicator
| -rw-r--r-- | gui/src/main/daemon-rpc.ts | 2 | ||||
| -rw-r--r-- | gui/src/renderer/components/main-view/FeatureIndicators.tsx | 2 | ||||
| -rw-r--r-- | gui/src/shared/daemon-rpc-types.ts | 1 | ||||
| -rw-r--r-- | mullvad-management-interface/proto/management_interface.proto | 1 | ||||
| -rw-r--r-- | mullvad-management-interface/src/types/conversions/features.rs | 2 | ||||
| -rw-r--r-- | mullvad-types/src/features.rs | 2 |
6 files changed, 10 insertions, 0 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts index 754f0b8d47..3ccfce85bf 100644 --- a/gui/src/main/daemon-rpc.ts +++ b/gui/src/main/daemon-rpc.ts @@ -1183,6 +1183,8 @@ function convertFromFeatureIndicator( return FeatureIndicator.customMssFix; case grpcTypes.FeatureIndicator.DAITA: return FeatureIndicator.daita; + case grpcTypes.FeatureIndicator.DAITA_USE_ANYWHERE: + return FeatureIndicator.daitaUseAnywhere; case grpcTypes.FeatureIndicator.SHADOWSOCKS: return FeatureIndicator.shadowsocks; } diff --git a/gui/src/renderer/components/main-view/FeatureIndicators.tsx b/gui/src/renderer/components/main-view/FeatureIndicators.tsx index 68ee0ae5ae..97ff92742b 100644 --- a/gui/src/renderer/components/main-view/FeatureIndicators.tsx +++ b/gui/src/renderer/components/main-view/FeatureIndicators.tsx @@ -216,6 +216,8 @@ function getFeatureIndicatorLabel(indicator: FeatureIndicator) { switch (indicator) { case FeatureIndicator.daita: return strings.daita; + case FeatureIndicator.daitaUseAnywhere: + return messages.pgettext('wireguard-settings-view', 'DAITA: Use Anywhere'); case FeatureIndicator.udp2tcp: case FeatureIndicator.shadowsocks: return messages.pgettext('wireguard-settings-view', 'Obfuscation'); diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts index 9cb3c15b5d..f888413047 100644 --- a/gui/src/shared/daemon-rpc-types.ts +++ b/gui/src/shared/daemon-rpc-types.ts @@ -183,6 +183,7 @@ export interface ITunnelStateRelayInfo { // The order of the variants match the priority order and can be sorted on. export enum FeatureIndicator { daita, + daitaUseAnywhere, quantumResistance, multihop, bridgeMode, diff --git a/mullvad-management-interface/proto/management_interface.proto b/mullvad-management-interface/proto/management_interface.proto index 4a7d46d003..595c8f3527 100644 --- a/mullvad-management-interface/proto/management_interface.proto +++ b/mullvad-management-interface/proto/management_interface.proto @@ -262,6 +262,7 @@ enum FeatureIndicator { CUSTOM_MTU = 11; CUSTOM_MSS_FIX = 12; DAITA = 13; + DAITA_USE_ANYWHERE = 14; } message ObfuscationEndpoint { diff --git a/mullvad-management-interface/src/types/conversions/features.rs b/mullvad-management-interface/src/types/conversions/features.rs index ac235d8163..971c2a0115 100644 --- a/mullvad-management-interface/src/types/conversions/features.rs +++ b/mullvad-management-interface/src/types/conversions/features.rs @@ -18,6 +18,7 @@ impl From<mullvad_types::features::FeatureIndicator> for proto::FeatureIndicator mullvad_types::features::FeatureIndicator::CustomMtu => CustomMtu, mullvad_types::features::FeatureIndicator::CustomMssFix => CustomMssFix, mullvad_types::features::FeatureIndicator::Daita => Daita, + mullvad_types::features::FeatureIndicator::DaitaUseAnywhere => DaitaUseAnywhere, } } } @@ -39,6 +40,7 @@ impl From<proto::FeatureIndicator> for mullvad_types::features::FeatureIndicator proto::FeatureIndicator::CustomMtu => Self::CustomMtu, proto::FeatureIndicator::CustomMssFix => Self::CustomMssFix, proto::FeatureIndicator::Daita => Self::Daita, + proto::FeatureIndicator::DaitaUseAnywhere => Self::DaitaUseAnywhere, } } } diff --git a/mullvad-types/src/features.rs b/mullvad-types/src/features.rs index f847c94af0..0a87262666 100644 --- a/mullvad-types/src/features.rs +++ b/mullvad-types/src/features.rs @@ -66,6 +66,7 @@ pub enum FeatureIndicator { CustomMtu, CustomMssFix, Daita, + DaitaUseAnywhere, } impl FeatureIndicator { @@ -85,6 +86,7 @@ impl FeatureIndicator { FeatureIndicator::CustomMtu => "Custom MTU", FeatureIndicator::CustomMssFix => "Custom MSS", FeatureIndicator::Daita => "DAITA", + FeatureIndicator::DaitaUseAnywhere => "Use Anywhere (DAITA)", } } } |
