Skip to content
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

Get rid of -V flag #1742

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Get rid of -V flag #1742

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b71f0e
Get rid of -V flag
Mygod Apr 9, 2018
a835c25
Remove unnecessary parentheses
Mygod Apr 9, 2018
57fd331
Fix issues with plugins
madeye Apr 9, 2018
943c9b3
Refine 57fd3317f8fdd8002649409647a07fda2f757969
Mygod Apr 10, 2018
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
2 changes: 1 addition & 1 deletion core/src/main/jni/shadowsocks-libev
Open in desktop
Submodule shadowsocks-libev updated 2 files
+13 −13 scripts/build_deb.sh
+539 −516 src/local.c
11 changes: 8 additions & 3 deletions mobile/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 @@ -191,11 +191,16 @@ object BaseService {
.put("method", profile.method)
val pluginPath = pluginPath
if (pluginPath != null) {
val pluginCmd = arrayListOf(pluginPath)
if (TcpFastOpen.sendEnabled) pluginCmd.add("--fast-open")
val pluginCmd = pluginPath
val pluginOpts = if (TcpFastOpen.sendEnabled) {
plugin.toString() + ";fast-open"
}
else {
plugin.toString()
}
config
.put("plugin", pluginCmd)
.put("plugin_opts", plugin.toString())
.put("plugin_opts", pluginOpts)
}
// sensitive Shadowsocks config is stored in
val file = File(if (UserManagerCompat.isUserUnlocked(app)) app.filesDir else @TargetApi(24) {
Expand Down
2 changes: 2 additions & 0 deletions mobile/src/main/java/com/github/shadowsocks/bg/VpnService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
}
}
if (profile.bypass) builder.addDisallowedApplication(me)
} else {
builder.addDisallowedApplication(packageName)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After adding these two lines, I can no longer reproduce #1740. Good catch though!

}

when (profile.route) {
Expand Down