Alawn/shadowsocks-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix socket protect in simple-obfs

Browse Source
This commit is contained in:
Max Lv
2017-01-20 09:57:26 +08:00
parent 0e85514c76
commit d734e9fd4e
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/src/main/scala/com/github/shadowsocks/BaseService.scala
+8 -2
View File
@@ -313,7 +313,7 @@ trait BaseService extends Service {
}
}
protected def buildShadowsocksConfig(file: String, localPortOffset: Int = 0): String = {
protected def buildShadowsocksConfig(file: String, localPortOffset: Int = 0, vpn: Boolean = false): String = {
val config = new JSONObject()
config.put("server", profile.host)
config.put("server_port", profile.remotePort)
@@ -323,7 +323,13 @@ trait BaseService extends Service {
if (profile.auth) config.put("auth", true)
if (pluginPath != null) {
config.put("plugin", pluginPath)
config.put("plugin_opts", plugin.toString)
val plugin_opts = if (vpn) {
"V;P=" + getApplicationInfo.dataDir + ";" + plugin.toString
} else {
plugin.toString
}
Log.d("shadowsocks", plugin_opts)
config.put("plugin_opts", plugin_opts)
}
IOUtils.writeString(file, config.toString)
file
mobile/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+2 -2
View File
@@ -167,7 +167,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
, "-b", "127.0.0.1"
, "-t", "600"
, "-P", getApplicationInfo.dataDir
, "-c", buildShadowsocksConfig(getApplicationInfo.dataDir + "/ss-local-vpn.conf"))
, "-c", buildShadowsocksConfig(getApplicationInfo.dataDir + "/ss-local-vpn.conf", 0, true))
if (profile.udpdns) cmd += "-u"
@@ -190,7 +190,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
, "-b", "127.0.0.1"
, "-L" , if (profile.remoteDns == null) "8.8.8.8:53" else profile.remoteDns + ":53"
, "-P", getApplicationInfo.dataDir
, "-c", buildShadowsocksConfig(getApplicationInfo.dataDir + "/ss-tunnel-vpn.conf", 53))
, "-c", buildShadowsocksConfig(getApplicationInfo.dataDir + "/ss-tunnel-vpn.conf", 53, true))
if (BuildConfig.DEBUG) Log.d(TAG, Commandline.toString(cmd))
sstunnelProcess = new GuardedProcess(cmd).start()
}