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

Move non-options to command line options

Browse Source
This commit is contained in:
Mygod
2017-01-20 15:35:57 +08:00
parent d734e9fd4e
commit 1041dc370a
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/src/main/scala/com/github/shadowsocks/BaseService.scala
+17 -17
View File
@@ -42,6 +42,8 @@ import okhttp3.{Dns, FormBody, OkHttpClient, Request}
import org.json.JSONObject
import scala.collection.mutable
import scala.collection.mutable.ArrayBuffer
import scala.collection.JavaConversions._
import scala.util.Random
trait BaseService extends Service {
@@ -49,7 +51,7 @@ trait BaseService extends Service {
@volatile private var state = State.STOPPED
@volatile protected var profile: Profile = _
@volatile private var plugin: PluginOptions = _
@volatile private var pluginPath: String = _
@volatile protected var pluginPath: String = _
case class NameNotResolvedException() extends IOException
case class NullConnectionException() extends NullPointerException
@@ -313,24 +315,22 @@ trait BaseService extends Service {
}
}
protected def buildShadowsocksConfig(file: String, localPortOffset: Int = 0, vpn: Boolean = false): String = {
protected def buildPluginCommandLine(): ArrayBuffer[String] = {
val result = ArrayBuffer(pluginPath)
if (TcpFastOpen.sendEnabled) result += "--fast-open"
result
}
protected def buildShadowsocksConfig(file: String, localPortOffset: Int = 0): String = {
val config = new JSONObject()
config.put("server", profile.host)
config.put("server_port", profile.remotePort)
config.put("local_port", profile.localPort + localPortOffset)
config.put("password", profile.password)
config.put("method", profile.method)
.put("server", profile.host)
.put("server_port", profile.remotePort)
.put("local_port", profile.localPort + localPortOffset)
.put("password", profile.password)
.put("method", profile.method)
if (profile.auth) config.put("auth", true)
if (pluginPath != null) {
config.put("plugin", pluginPath)
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)
}
if (pluginPath != null) config
.put("plugin", Commandline.toString(buildPluginCommandLine()))
.put("plugin_opts", plugin.toString)
IOUtils.writeString(file, config.toString)
file
}
mobile/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+5 -2
View File
@@ -162,12 +162,15 @@ class ShadowsocksVpnService extends VpnService with BaseService {
}
}
override protected def buildPluginCommandLine(): ArrayBuffer[String] =
super.buildPluginCommandLine() ++= Seq("-V", "-P", getApplicationInfo.dataDir)
def startShadowsocksDaemon() {
val cmd = ArrayBuffer[String](getApplicationInfo.nativeLibraryDir + "/libss-local.so", "-V"
, "-b", "127.0.0.1"
, "-t", "600"
, "-P", getApplicationInfo.dataDir
, "-c", buildShadowsocksConfig(getApplicationInfo.dataDir + "/ss-local-vpn.conf", 0, true))
, "-c", buildShadowsocksConfig(getApplicationInfo.dataDir + "/ss-local-vpn.conf", 0))
if (profile.udpdns) cmd += "-u"
@@ -190,7 +193,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, true))
, "-c", buildShadowsocksConfig(getApplicationInfo.dataDir + "/ss-tunnel-vpn.conf", 53))
if (BuildConfig.DEBUG) Log.d(TAG, Commandline.toString(cmd))
sstunnelProcess = new GuardedProcess(cmd).start()
}