fixed dns relay bug.

Author: KagayamaKaede

CHANGE.md

@@ -1,3 +1,7 @@
+##1.0.3 Beta Fix2
+
++ Fixed dns relay issue.
+
 ##1.0.3 Beta Fix
 
 + Fixed port change issue.

app/app.iml

@@ -94,8 +94,8 @@
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="org.xbill.dns_2.1.7" level="project" />
-    <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
     <orderEntry type="library" exported="" name="core-2.0" level="project" />
+    <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="core-3.1.0" level="project" />
     <orderEntry type="library" exported="" name="android-2.0" level="project" />

app/src/main/java/com/proxy/shadowsocksr/SSRVPNService.java

@@ -41,6 +41,7 @@ public class SSRVPNService extends VpnService
 {
     private int VPN_MTU = 1500;
     private String PRIVATE_VLAN = "27.27.27.%s";
+    private String PRIVATE_VLAN6 = "fdfe:dcba:9875::%s";
     private ParcelFileDescriptor conn;
 
     private String session;
@@ -217,7 +218,7 @@ private void startRunner()
                 }
                 //
                 startSSRDaemon();
-                if (globalProfile.dnsForward)
+                if (!globalProfile.dnsForward)
                 {
                     startDnsDaemon();
                     startDnsTunnel();
@@ -356,6 +357,7 @@ private void startDnsTunnel()
     private void startDnsDaemon()
     {
         String pdnsd;
+        //ipv6 config
         if (globalProfile.route.equals("bypass_lan_list"))
         {
             String reject = getResources().getString(R.string.reject);
@@ -384,6 +386,9 @@ private int startVpn()
                .addAddress(String.format(PRIVATE_VLAN, "1"), 24)
                .addDnsServer("8.8.8.8");
 
+        //builder.addAddress(String.format(PRIVATE_VLAN6, "1"), 126);
+        //builder.addRoute("::", 0);
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
         {
             builder.allowFamily(OsConstants.AF_INET6);
@@ -446,6 +451,8 @@ private int startVpn()
                                    String.format(PRIVATE_VLAN, "2"),
                                    ssProfile.localPort, fd, VPN_MTU, Consts.baseDir);
 
+        //cmd += " --netif-ip6addr " + String.format(PRIVATE_VLAN6,"2");
+
         if (globalProfile.dnsForward)
         {
             cmd += " --enable-udprelay";