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

no more dns proxy option

Browse Source
This commit is contained in:
Max Lv
2013-06-03 20:29:47 +08:00
parent d516af3ca0
commit 87bc467335
3 changed files with 6 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/res/xml/pref_feature.xml
-6
View File
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<CheckBoxPreference
android:defaultValue="true"
android:key="isDNSProxy"
android:summary="@string/dns_proxy_summary"
android:title="@string/dns_proxy">
</CheckBoxPreference>
<CheckBoxPreference
android:defaultValue="true"
android:key="isGFWList"
src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
+3 -8
View File
@@ -272,9 +272,6 @@ class ShadowsocksService extends Service {
/** Called when the activity is first created. */
def handleConnection: Boolean = {
if (config.isHTTPProxy) {
startPolipoDaemon()
}
startShadowsocksDaemon()
startDnsDaemon()
startRedsocksDaemon()
@@ -438,11 +435,9 @@ class ShadowsocksService extends Service {
init_sb.append(cmd_bypass.replace("-d 0.0.0.0", "-d " + config.proxy))
}
init_sb.append(cmd_bypass.replace("0.0.0.0", "127.0.0.1"))
if (!config.isDNSProxy) {
init_sb.append(cmd_bypass.replace("-d 0.0.0.0", "--dport " + 53))
init_sb
.append(cmd_bypass.replace("-d 0.0.0.0", "-m owner --uid-owner " + getApplicationInfo.uid))
}
init_sb.append(cmd_bypass.replace("-d 0.0.0.0", "--dport " + 53))
init_sb
.append(cmd_bypass.replace("-d 0.0.0.0", "-m owner --uid-owner " + getApplicationInfo.uid))
if (hasRedirectSupport) {
init_sb
.append(Utils.getIptables)
src/main/scala/com/github/shadowsocks/Utils.scala
+3 -16
View File
@@ -58,8 +58,6 @@ object Key {
val isGlobalProxy = "isGlobalProxy"
val isGFWList = "isGFWList"
val isBypassApps = "isBypassApps"
val isDNSProxy = "isDNSProxy"
val isHTTPProxy = "isHTTPProxy"
val proxy = "proxy"
val sitekey = "sitekey"
@@ -72,8 +70,6 @@ case class Config (
isGlobalProxy: Boolean,
isGFWList: Boolean,
isBypassApps: Boolean,
isDNSProxy: Boolean,
isHTTPProxy: Boolean,
var proxy: String,
sitekey: String,
encMethod: String,
@@ -104,8 +100,6 @@ object Extra {
edit.putBoolean(Key.isGlobalProxy, config.isGlobalProxy)
edit.putBoolean(Key.isGFWList, config.isGFWList)
edit.putBoolean(Key.isBypassApps, config.isBypassApps)
edit.putBoolean(Key.isDNSProxy, config.isDNSProxy)
edit.putBoolean(Key.isHTTPProxy, config.isHTTPProxy)
edit.putString(Key.proxy, config.proxy)
edit.putString(Key.sitekey, config.sitekey)
@@ -120,24 +114,20 @@ object Extra {
val isGlobalProxy = intent.getBooleanExtra(Key.isGlobalProxy, false)
val isGFWList = intent.getBooleanExtra(Key.isGFWList, false)
val isBypassApps = intent.getBooleanExtra(Key.isBypassApps, false)
val isDNSProxy = intent.getBooleanExtra(Key.isDNSProxy, false)
val isHTTPProxy = intent.getBooleanExtra(Key.isHTTPProxy, false)
val proxy = intent.getStringExtra(Key.proxy)
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, isDNSProxy,
isHTTPProxy, proxy, sitekey, encMethod, remotePort, localPort)
new Config(isGlobalProxy, isGFWList, isBypassApps,
proxy, sitekey, encMethod, remotePort, localPort)
}
def put(settings: SharedPreferences, intent: Intent) {
val isGlobalProxy = settings.getBoolean(Key.isGlobalProxy, false)
val isGFWList = settings.getBoolean(Key.isGFWList, false)
val isBypassApps = settings.getBoolean(Key.isBypassApps, false)
val isDNSProxy = settings.getBoolean(Key.isDNSProxy, false)
val isHTTPProxy = settings.getBoolean(Key.isHTTPProxy, false)
val proxy = settings.getString(Key.proxy, "127.0.0.1") match {
case "198.199.101.152" => "s.maxcdn.info"
case s: String => s
@@ -153,8 +143,7 @@ object Extra {
}
}
val localProt: Int = try {
val p = Integer.valueOf(settings.getString(Key.localPort, "1984"))
if (isHTTPProxy) p - 1 else p
Integer.valueOf(settings.getString(Key.localPort, "1984"))
} catch {
case ex: NumberFormatException => {
1984
@@ -164,8 +153,6 @@ object Extra {
intent.putExtra(Key.isGlobalProxy, isGlobalProxy)
intent.putExtra(Key.isGFWList, isGFWList)
intent.putExtra(Key.isBypassApps, isBypassApps)
intent.putExtra(Key.isDNSProxy, isDNSProxy)
intent.putExtra(Key.isHTTPProxy, isHTTPProxy)
intent.putExtra(Key.proxy, proxy)
intent.putExtra(Key.sitekey, sitekey)