Commit 298d0033 authored by Max Lv's avatar Max Lv

refine the bypass order

parent 45fc2b45
...@@ -507,22 +507,20 @@ public class ShadowsocksService extends Service { ...@@ -507,22 +507,20 @@ public class ShadowsocksService extends Service {
init_sb.append(Utils.getIptables()).append(" -t nat -F OUTPUT\n"); init_sb.append(Utils.getIptables()).append(" -t nat -F OUTPUT\n");
if (hasRedirectSupport) {
init_sb.append(Utils.getIptables()).append(" -t nat -A OUTPUT -p udp --dport 53 -j REDIRECT --to ").append(DNS_PORT).append("\n");
} else {
init_sb.append(Utils.getIptables()).append(" -t nat -A OUTPUT -p udp --dport 53 -j DNAT --to-destination 127.0.0.1:").append(DNS_PORT).append("\n");
}
String cmd_bypass = Utils.getIptables() + CMD_IPTABLES_RETURN; 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 " + remotePort));
init_sb.append(cmd_bypass.replace("-d 0.0.0.0", "--dport " + 53)); init_sb.append(cmd_bypass.replace("-d 0.0.0.0", "--dport " + 53));
init_sb.append(cmd_bypass.replace("-d 0.0.0.0", "--dport " + 8153)); 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", "--dport " + port));
init_sb.append(cmd_bypass.replace("-d 0.0.0.0", "-m owner --uid-owner " init_sb.append(cmd_bypass.replace("-d 0.0.0.0", "-m owner --uid-owner "
+ getApplicationInfo().uid)); + 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");
} else {
init_sb.append(Utils.getIptables()).append(" -t nat -A OUTPUT -p udp --dport 53 -j DNAT --to-destination 127.0.0.1:").append(DNS_PORT).append("\n");
}
if (isGFWList) { if (isGFWList) {
String[] chn_list = getResources().getStringArray(R.array.chn_list); String[] chn_list = getResources().getStringArray(R.array.chn_list);
......
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