Skip to content

Commit 3e3244d

Browse files
committedAug 27, 2024
Removed shadow socks predefined ports
1 parent 0199d63 commit 3e3244d

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed
 

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ShadowsocksSettingsScreen.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import net.mullvad.mullvadvpn.compose.test.SHADOWSOCKS_PORT_ITEM_AUTOMATIC_TEST_
2727
import net.mullvad.mullvadvpn.compose.test.SHADOWSOCKS_PORT_ITEM_X_TEST_TAG
2828
import net.mullvad.mullvadvpn.compose.transitions.SlideInFromRightTransition
2929
import net.mullvad.mullvadvpn.compose.util.OnNavResultValue
30+
import net.mullvad.mullvadvpn.constant.SHADOWSOCKS_AVAILABLE_PORTS
3031
import net.mullvad.mullvadvpn.constant.SHADOWSOCKS_PRESET_PORTS
3132
import net.mullvad.mullvadvpn.lib.model.Constraint
3233
import net.mullvad.mullvadvpn.lib.model.Port
@@ -75,7 +76,7 @@ fun ShadowsocksSettings(
7576
context.getString(R.string.shadowsocks)
7677
),
7778
customPort = state.customPort,
78-
allowedPortRanges = state.validPortRanges,
79+
allowedPortRanges = SHADOWSOCKS_AVAILABLE_PORTS,
7980
)
8081
)
8182
)
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
package net.mullvad.mullvadvpn.constant
22

33
import net.mullvad.mullvadvpn.lib.model.Port
4+
import net.mullvad.mullvadvpn.lib.model.PortRange
45

56
val WIREGUARD_PRESET_PORTS = listOf(Port(51820), Port(53))
67
val UDP2TCP_PRESET_PORTS = listOf(Port(80), Port(5001))
7-
val SHADOWSOCKS_PRESET_PORTS = listOf(Port(80), Port(443))
8+
val SHADOWSOCKS_PRESET_PORTS = emptyList<Port>()
9+
val SHADOWSOCKS_AVAILABLE_PORTS =
10+
listOf(PortRange(IntRange(0, 65535))) // Currently we consider all ports to be available

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/PortExtensions.kt

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ package net.mullvad.mullvadvpn.util
33
import net.mullvad.mullvadvpn.lib.model.Port
44
import net.mullvad.mullvadvpn.lib.model.PortRange
55

6-
// fun Port.in()
7-
86
fun Port.inAnyOf(portRanges: List<PortRange>): Boolean =
97
portRanges.any { portRange -> this in portRange }
108

0 commit comments

Comments
 (0)
Failed to load comments.