Commit 9517d1f3 authored by Max Lv's avatar Max Lv

clean up

parent 8a66df52
...@@ -141,8 +141,9 @@ class ShadowVpnService extends VpnService { ...@@ -141,8 +141,9 @@ class ShadowVpnService extends VpnService {
val cmd: String = (BASE + val cmd: String = (BASE +
"shadowsocks -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -f " + "shadowsocks -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -f " +
BASE + BASE +
"shadowsocks.pid").format(config.proxy, config.remotePort, config.localPort, "shadowsocks.pid")
config.sitekey, config.encMethod) .format(config.proxy, config.remotePort, config.localPort, config.sitekey,
config.encMethod)
Log.d(TAG, cmd) Log.d(TAG, cmd)
System.exec(cmd) System.exec(cmd)
} }
...@@ -188,7 +189,8 @@ class ShadowVpnService extends VpnService { ...@@ -188,7 +189,8 @@ class ShadowVpnService extends VpnService {
// Resolve server address // Resolve server address
var resolved: Boolean = false var resolved: Boolean = false
if (!InetAddressUtils.isIPv4Address(config.proxy) && !InetAddressUtils.isIPv6Address(config.proxy)) { if (!InetAddressUtils.isIPv4Address(config.proxy) &&
!InetAddressUtils.isIPv6Address(config.proxy)) {
Utils.resolve(config.proxy, enableIPv6 = true) match { Utils.resolve(config.proxy, enableIPv6 = true) match {
case Some(addr) => case Some(addr) =>
config.proxy = addr config.proxy = addr
...@@ -313,7 +315,8 @@ class ShadowVpnService extends VpnService { ...@@ -313,7 +315,8 @@ class ShadowVpnService extends VpnService {
+ "--socks-server-addr 127.0.0.1:%d " + "--socks-server-addr 127.0.0.1:%d "
+ "--tunfd %d " + "--tunfd %d "
+ "--tunmtu %d " + "--tunmtu %d "
+ "--pid %stun2socks.pid").format(localAddress.format(2), udpgw, config.localPort, fd, VPN_MTU, BASE) + "--pid %stun2socks.pid")
.format(localAddress.format(2), udpgw, config.localPort, fd, VPN_MTU, BASE)
Log.d(TAG, cmd) Log.d(TAG, cmd)
System.exec(cmd) System.exec(cmd)
} }
......
...@@ -163,8 +163,9 @@ class ShadowsocksService extends Service { ...@@ -163,8 +163,9 @@ class ShadowsocksService extends Service {
val cmd: String = (BASE + val cmd: String = (BASE +
"shadowsocks -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -f " + "shadowsocks -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -f " +
BASE + BASE +
"shadowsocks.pid").format(config.proxy, config.remotePort, config.localPort, "shadowsocks.pid")
config.sitekey, config.encMethod) .format(config.proxy, config.remotePort, config.localPort, config.sitekey,
config.encMethod)
Log.d(TAG, cmd) Log.d(TAG, cmd)
System.exec(cmd) System.exec(cmd)
} }
...@@ -217,7 +218,8 @@ class ShadowsocksService extends Service { ...@@ -217,7 +218,8 @@ class ShadowsocksService extends Service {
killProcesses() killProcesses()
var resolved: Boolean = false var resolved: Boolean = false
if (!InetAddressUtils.isIPv4Address(config.proxy) && !InetAddressUtils.isIPv6Address(config.proxy)) { if (!InetAddressUtils.isIPv4Address(config.proxy) &&
!InetAddressUtils.isIPv6Address(config.proxy)) {
Utils.resolve(config.proxy, enableIPv6 = true) match { Utils.resolve(config.proxy, enableIPv6 = true) match {
case Some(a) => case Some(a) =>
config.proxy = a config.proxy = a
......
...@@ -70,16 +70,8 @@ object Key { ...@@ -70,16 +70,8 @@ object Key {
val localPort = "port" val localPort = "port"
} }
case class Config ( case class Config(isGlobalProxy: Boolean, isGFWList: Boolean, isBypassApps: Boolean,
isGlobalProxy: Boolean, var proxy: String, sitekey: String, encMethod: String, remotePort: Int, localPort: Int)
isGFWList: Boolean,
isBypassApps: Boolean,
var proxy: String,
sitekey: String,
encMethod: String,
remotePort: Int,
localPort: Int
)
object State { object State {
val INIT = 0 val INIT = 0
...@@ -114,18 +106,18 @@ object Extra { ...@@ -114,18 +106,18 @@ object Extra {
edit.apply() edit.apply()
} }
def get(intent: Intent): Config = { def get(intent: Intent): Config = {
val isGlobalProxy = intent.getBooleanExtra(Key.isGlobalProxy, false) val isGlobalProxy = intent.getBooleanExtra(Key.isGlobalProxy, false)
val isGFWList = intent.getBooleanExtra(Key.isGFWList, false) val isGFWList = intent.getBooleanExtra(Key.isGFWList, false)
val isBypassApps = intent.getBooleanExtra(Key.isBypassApps, false) val isBypassApps = intent.getBooleanExtra(Key.isBypassApps, false)
val proxy = intent.getStringExtra(Key.proxy) val proxy = intent.getStringExtra(Key.proxy)
val sitekey = intent.getStringExtra(Key.sitekey) val sitekey = intent.getStringExtra(Key.sitekey)
val encMethod = intent.getStringExtra(Key.encMethod) val encMethod = intent.getStringExtra(Key.encMethod)
val remotePort = intent.getIntExtra(Key.remotePort, 1984) val remotePort = intent.getIntExtra(Key.remotePort, 1984)
val localPort = intent.getIntExtra(Key.localPort, 1984) val localPort = intent.getIntExtra(Key.localPort, 1984)
new Config(isGlobalProxy, isGFWList, isBypassApps, new Config(isGlobalProxy, isGFWList, isBypassApps, proxy, sitekey, encMethod, remotePort,
proxy, sitekey, encMethod, remotePort, localPort) localPort)
} }
def put(settings: SharedPreferences, intent: Intent) { def put(settings: SharedPreferences, intent: Intent) {
...@@ -192,7 +184,9 @@ object Utils { ...@@ -192,7 +184,9 @@ object Utils {
def isServiceStarted(name: String, context: Context): Boolean = { def isServiceStarted(name: String, context: Context): Boolean = {
import scala.collection.JavaConversions._ import scala.collection.JavaConversions._
val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE).asInstanceOf[ActivityManager] val activityManager = context
.getSystemService(Context.ACTIVITY_SERVICE)
.asInstanceOf[ActivityManager]
val services = activityManager.getRunningServices(Integer.MAX_VALUE) val services = activityManager.getRunningServices(Integer.MAX_VALUE)
for (service <- services) { for (service <- services) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment