Revert "Add Shadowsocks to retry order"

This reverts commit e75960b.
mullvad · Aug 8, 2024 · 5ce68d3 · 5ce68d3
1 parent 8c0583e
commit 5ce68d3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/docs/relay-selector.md b/docs/relay-selector.md
@@ -55,10 +55,9 @@ constraints the following default ones will take effect:
   - The third attempt will connect to a Wireguard relay over IPv6 (if IPv6 is configured on the host) on a random port
 - The remaining attempts will alternate between Wireguard and OpenVPN
   - The fourth attempt will connect to an OpenVPN relay over TCP on port 443
-  - The fifth attempt will connect to a Wireguard relay on a random port using Shadowsocks for obfuscation
-  - The sixth attempt will connect to a Wireguard relay on a random port using [UDP2TCP obfuscation](https://github.com/mullvad/udp-over-tcp)
-  - The seventh attempt will connect to a Wireguard relay over IPv6 on a random port using UDP2TCP obfuscation (if IPv6 is configured on the host)
-  - The eighth attempt will connect to an OpenVPN relay over a bridge on a random port
+  - The fifth attempt will connect to a Wireguard relay on a random port using [UDP2TCP obfuscation](https://github.com/mullvad/udp-over-tcp)
+  - The sixth attempt will connect to a Wireguard relay over IPv6 on a random port using UDP2TCP obfuscation (if IPv6 is configured on the host)
+  - The seventh attempt will connect to an OpenVPN relay over a bridge on a random port
 
 If no tunnel has been established after exhausting this list of attempts, the relay selector will
 loop back to the first default constraint and continue its search from there.

diff --git a/mullvad-relay-selector/src/relay_selector/mod.rs b/mullvad-relay-selector/src/relay_selector/mod.rs
@@ -74,16 +74,14 @@ pub static RETRY_ORDER: Lazy<Vec<RelayQuery>> = Lazy::new(|| {
             .port(443)
             .build(),
         // 5
-        RelayQueryBuilder::new().wireguard().shadowsocks().build(),
-        // 6
         RelayQueryBuilder::new().wireguard().udp2tcp().build(),
-        // 7
+        // 6
         RelayQueryBuilder::new()
             .wireguard()
             .udp2tcp()
             .ip_version(IpVersion::V6)
             .build(),
-        // 8
+        // 7
         RelayQueryBuilder::new()
             .openvpn()
             .transport_protocol(TransportProtocol::Tcp)

diff --git a/mullvad-relay-selector/tests/relay_selector.rs b/mullvad-relay-selector/tests/relay_selector.rs
@@ -254,16 +254,14 @@ fn assert_retry_order() {
             .port(443)
             .build(),
         // 5
-        RelayQueryBuilder::new().wireguard().shadowsocks().build(),
-        // 6
         RelayQueryBuilder::new().wireguard().udp2tcp().build(),
-        // 7
+        // 6
         RelayQueryBuilder::new()
             .wireguard()
             .udp2tcp()
             .ip_version(IpVersion::V6)
             .build(),
-        // 8
+        // 7
         RelayQueryBuilder::new()
             .openvpn()
             .transport_protocol(TransportProtocol::Tcp)