Skip to content

Proxy UDP fallback for hostname ACL routes #3252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TurboTheTurtle wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −1
Open

Proxy UDP fallback for hostname ACL routes #3252

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion core/src/main/java/com/github/shadowsocks/bg/BaseService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,11 @@ object BaseService {
val (profile, fallback) = expanded
try {
data.proxy = ProxyInstance(profile)
data.udpFallback = if (fallback == null) null else ProxyInstance(fallback, profile.route)
data.udpFallback = if (fallback == null) null else ProxyInstance(fallback, when (profile.route) {
// UDP relay sees IP endpoints, so hostname-only ACL routes would bypass the selected fallback.
Acl.GFWLIST, Acl.CUSTOM_RULES -> Acl.ALL
else -> profile.route
})
} catch (e: IllegalArgumentException) {
data.notification = createNotification("")
stopRunner(false, e.message)
Expand Down