From 6bae1bbce431e0c12e59d5e0727d483e03ace361 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Fri, 7 Mar 2014 19:14:48 +0800 Subject: [PATCH] Revert "bypass system dns addr" This reverts commit 1c4c54e96287e81157db1a034609f35bb53539fc. --- src/main/java/com/github/shadowsocks/System.java | 1 - src/main/jni/system.cpp | 11 +---------- .../github/shadowsocks/ShadowsocksNatService.scala | 2 +- .../github/shadowsocks/ShadowsocksVpnService.scala | 2 +- .../com/github/shadowsocks/utils/ConfigUtils.scala | 2 +- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/github/shadowsocks/System.java b/src/main/java/com/github/shadowsocks/System.java index 0a9cdd70..0f17bcaf 100755 --- a/src/main/java/com/github/shadowsocks/System.java +++ b/src/main/java/com/github/shadowsocks/System.java @@ -45,5 +45,4 @@ public class System { public static native void exec(String cmd); public static native String getABI(); - public static native String getDNS1(); } diff --git a/src/main/jni/system.cpp b/src/main/jni/system.cpp index 940d4bef..4e491eb2 100644 --- a/src/main/jni/system.cpp +++ b/src/main/jni/system.cpp @@ -6,18 +6,11 @@ #include #include #include -#include #define LOGI(...) do { __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__); } while(0) #define LOGW(...) do { __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__); } while(0) #define LOGE(...) do { __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__); } while(0) -jstring Java_com_github_shadowsocks_system_getdns1(JNIEnv *env, jobject thiz) { - char dns1[PROP_VALUE_MAX]; - __system_property_get("net.dns1", dns1); - return env->NewStringUTF(dns1); -} - jstring Java_com_github_shadowsocks_system_getabi(JNIEnv *env, jobject thiz) { AndroidCpuFamily family = android_getCpuFamily(); uint64_t features = android_getCpuFeatures(); @@ -52,9 +45,7 @@ static JNINativeMethod method_table[] = { { "exec", "(Ljava/lang/String;)V", (void*) Java_com_github_shadowsocks_system_exec }, { "getABI", "()Ljava/lang/String;", - (void*) Java_com_github_shadowsocks_system_getabi }, - { "getDNS1", "()Ljava/lang/String;", - (void*) Java_com_github_shadowsocks_system_getdns1 } + (void*) Java_com_github_shadowsocks_system_getabi } }; /* diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala index d1b3ec39..d9da32fe 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala @@ -118,7 +118,7 @@ class ShadowsocksNatService extends Service with BaseService { Path.BASE + "ss-local.pid") .format(config.proxy, config.remotePort, 8153, config.sitekey, config.encMethod) } else { - val conf = ConfigUtils.PDNSD.format("127.0.0.1", getString(R.string.exclude), System.getDNS1); + val conf = ConfigUtils.PDNSD.format("127.0.0.1", getString(R.string.exclude)); ConfigUtils.printToFile(new File(Path.BASE + "pdnsd.conf"))(p => { p.println(conf) }) diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala index 210ad839..041b54d0 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala @@ -91,7 +91,7 @@ class ShadowsocksVpnService extends VpnService with BaseService { Path.BASE + "ss-tunnel.pid") .format(config.proxy, config.remotePort, 8153, config.sitekey, config.encMethod) } else { - val conf = ConfigUtils.PDNSD.format("0.0.0.0", getString(R.string.exclude), System.getDNS1) + val conf = ConfigUtils.PDNSD.format("0.0.0.0", getString(R.string.exclude)) ConfigUtils.printToFile(new File(Path.BASE + "pdnsd.conf"))(p => { p.println(conf) }) diff --git a/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala b/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala index ae7dc5aa..020fedde 100644 --- a/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala +++ b/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala @@ -86,7 +86,7 @@ object ConfigUtils { | |server { | label = "china-servers"; - | ip = %s, 114.114.114.114, 114.114.115.115; + | ip = 114.114.114.114, 114.114.115.115; | timeout = 5; |} |