summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2023-10-26 09:37:05 +0200
committerMarkus Pettersson <markus.pettersson@mullvad.net>2023-10-26 09:37:05 +0200
commit7b8db2b43fa800b459d5fc9ea8a2085b96a631d9 (patch)
tree5adc18b789af1fa11db09444040a31e5e8d1d898
parentbeb1fe5aa803aa347b82832f4a875aa8adfed849 (diff)
parent2d09bf9f8e23d853a7ae4880bacd7f96299ec826 (diff)
downloadmullvadvpn-7b8db2b43fa800b459d5fc9ea8a2085b96a631d9.tar.xz
mullvadvpn-7b8db2b43fa800b459d5fc9ea8a2085b96a631d9.zip
Merge branch 'use-snake-case-for-access-methods-des-433'
-rw-r--r--mullvad-types/src/access_method.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/mullvad-types/src/access_method.rs b/mullvad-types/src/access_method.rs
index 30c1f25192..249c097ba1 100644
--- a/mullvad-types/src/access_method.rs
+++ b/mullvad-types/src/access_method.rs
@@ -104,6 +104,7 @@ impl std::fmt::Display for Id {
/// Access Method datastructure.
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Hash)]
+#[serde(rename_all = "snake_case")]
pub enum AccessMethod {
BuiltIn(BuiltInAccessMethod),
Custom(CustomAccessMethod),
@@ -170,6 +171,7 @@ impl AccessMethodSetting {
/// Built-In access method datastructure.
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Hash)]
+#[serde(rename_all = "snake_case")]
pub enum BuiltInAccessMethod {
Direct,
Bridge,
@@ -177,12 +179,14 @@ pub enum BuiltInAccessMethod {
/// Custom access method datastructure.
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)]
+#[serde(rename_all = "snake_case")]
pub enum CustomAccessMethod {
Shadowsocks(Shadowsocks),
Socks5(Socks5),
}
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)]
+#[serde(rename_all = "snake_case")]
pub enum Socks5 {
Local(Socks5Local),
Remote(Socks5Remote),