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

add dns proxy option

Browse Source
This commit is contained in:
Max Lv
2012-12-20 20:48:38 +08:00
parent 1e2b3c8d8a
commit bbdcb44078
5 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/github/shadowsocks/ShadowsocksService.java
+21 -17
View File
@@ -163,6 +163,7 @@ public class ShadowsocksService extends Service {
private boolean isGlobalProxy = false;
private boolean isGFWList = false;
private boolean isBypassApps = false;
private boolean isDNSProxy = false;
private ProxyedApp apps[];
private Method mSetForeground;
private Method mStartForeground;
@@ -203,7 +204,7 @@ public class ShadowsocksService extends Service {
new Thread() {
@Override
public void run() {
final String cmd = String.format(BASE +
final String cmd = String.format(BASE +
"shadowsocks -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\"",
appHost, remotePort, port, sitekey);
Node.exec(cmd);
@@ -251,6 +252,7 @@ public class ShadowsocksService extends Service {
isGlobalProxy = settings.getBoolean("isGlobalProxy", false);
isGFWList = settings.getBoolean("isGFWList", false);
isBypassApps = settings.getBoolean("isBypassApps", false);
isDNSProxy = settings.getBoolean("isDNSProxy", false);
new Thread(new Runnable() {
@Override
@@ -258,16 +260,20 @@ public class ShadowsocksService extends Service {
boolean resolved = false;
if (appHost != null) {
InetAddress addr = null;
try {
addr = InetAddress.getByName(appHost);
} catch (UnknownHostException ignored) {
}
if (addr != null) {
appHost = addr.getHostAddress();
resolved = true;
if (isDNSProxy) {
if (appHost != null) {
InetAddress addr = null;
try {
addr = InetAddress.getByName(appHost);
} catch (UnknownHostException ignored) {
}
if (addr != null) {
appHost = addr.getHostAddress();
resolved = true;
}
}
} else {
resolved = true;
}
handler.sendEmptyMessage(MSG_CONNECT_START);
@@ -519,17 +525,17 @@ public class ShadowsocksService extends Service {
StringBuilder http_sb = new StringBuilder();
StringBuilder https_sb = new StringBuilder();
init_sb.append(Utils.getIptables()).append(" -t nat -F OUTPUT\n");
String cmd_bypass = Utils.getIptables() + CMD_IPTABLES_RETURN;
init_sb.append(cmd_bypass.replace("-d 0.0.0.0", "--dport " + remotePort));
//init_sb.append(cmd_bypass.replace("-d 0.0.0.0", "--dport " + 53));
init_sb.append(cmd_bypass.replace("0.0.0.0", "127.0.0.1"));
//init_sb.append(cmd_bypass.replace("-d 0.0.0.0", "-m owner --uid-owner "
//+ getApplicationInfo().uid));
if (!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));
}
if (hasRedirectSupport) {
init_sb.append(Utils.getIptables()).append(" -t nat -A OUTPUT -p udp --dport 53 -j REDIRECT --to ").append(DNS_PORT).append("\n");
@@ -577,8 +583,6 @@ public class ShadowsocksService extends Service {
String redt_rules = http_sb.toString();
redt_rules += https_sb.toString();
Utils.runRootCommand(redt_rules);
return true;