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

clean up

Browse Source
This commit is contained in:
Max Lv
2013-06-04 15:14:52 +08:00
parent 8a66df520e
commit 9517d1f307
3 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/scala/com/github/shadowsocks/ShadowVpnService.scala
+7 -4
View File
@@ -141,8 +141,9 @@ class ShadowVpnService extends VpnService {
val cmd: String = (BASE +
"shadowsocks -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -f " +
BASE +
"shadowsocks.pid").format(config.proxy, config.remotePort, config.localPort,
config.sitekey, config.encMethod)
"shadowsocks.pid")
.format(config.proxy, config.remotePort, config.localPort, config.sitekey,
config.encMethod)
Log.d(TAG, cmd)
System.exec(cmd)
}
@@ -188,7 +189,8 @@ class ShadowVpnService extends VpnService {
// Resolve server address
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 {
case Some(addr) =>
config.proxy = addr
@@ -313,7 +315,8 @@ class ShadowVpnService extends VpnService {
+ "--socks-server-addr 127.0.0.1:%d "
+ "--tunfd %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)
System.exec(cmd)
}
src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
+5 -3
View File
@@ -163,8 +163,9 @@ class ShadowsocksService extends Service {
val cmd: String = (BASE +
"shadowsocks -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -f " +
BASE +
"shadowsocks.pid").format(config.proxy, config.remotePort, config.localPort,
config.sitekey, config.encMethod)
"shadowsocks.pid")
.format(config.proxy, config.remotePort, config.localPort, config.sitekey,
config.encMethod)
Log.d(TAG, cmd)
System.exec(cmd)
}
@@ -217,7 +218,8 @@ class ShadowsocksService extends Service {
killProcesses()
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 {
case Some(a) =>
config.proxy = a
src/main/scala/com/github/shadowsocks/Utils.scala
+10 -16
View File
@@ -70,16 +70,8 @@ object Key {
val localPort = "port"
}
case class Config (
isGlobalProxy: Boolean,
isGFWList: Boolean,
isBypassApps: Boolean,
var proxy: String,
sitekey: String,
encMethod: String,
remotePort: Int,
localPort: Int
)
case class Config(isGlobalProxy: Boolean, isGFWList: Boolean, isBypassApps: Boolean,
var proxy: String, sitekey: String, encMethod: String, remotePort: Int, localPort: Int)
object State {
val INIT = 0
@@ -114,18 +106,18 @@ object Extra {
edit.apply()
}
def get(intent: Intent): Config = {
def get(intent: Intent): Config = {
val isGlobalProxy = intent.getBooleanExtra(Key.isGlobalProxy, false)
val isGFWList = intent.getBooleanExtra(Key.isGFWList, false)
val isBypassApps = intent.getBooleanExtra(Key.isBypassApps, false)
val proxy = intent.getStringExtra(Key.proxy)
val sitekey = intent.getStringExtra(Key.sitekey)
val encMethod = intent.getStringExtra(Key.encMethod)
val sitekey = intent.getStringExtra(Key.sitekey)
val encMethod = intent.getStringExtra(Key.encMethod)
val remotePort = intent.getIntExtra(Key.remotePort, 1984)
val localPort = intent.getIntExtra(Key.localPort, 1984)
new Config(isGlobalProxy, isGFWList, isBypassApps,
proxy, sitekey, encMethod, remotePort, localPort)
new Config(isGlobalProxy, isGFWList, isBypassApps, proxy, sitekey, encMethod, remotePort,
localPort)
}
def put(settings: SharedPreferences, intent: Intent) {
@@ -192,7 +184,9 @@ object Utils {
def isServiceStarted(name: String, context: Context): Boolean = {
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)
for (service <- services) {