Loading orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +19 −18 Original line number Diff line number Diff line Loading @@ -41,10 +41,13 @@ import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.transproxy.TorifiedApp; import org.torproject.android.service.util.TorServiceUtils; import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintStream; import java.net.InetAddress; import java.util.ArrayList; Loading Loading @@ -405,14 +408,26 @@ public class OrbotVpnManager implements Handler.Callback { ArrayList<String> customEnv = new ArrayList<String>(); String baseDirectory = filePdnsd.getParent(); String cmdString = "sh " + filePdnsd.getCanonicalPath() + " -c " + baseDirectory + "/pdnsd.conf"; Process proc = Runtime.getRuntime().exec(cmdString); String[] cmdString = {filePdnsd.getCanonicalPath(),"-c",baseDirectory + "/pdnsd.conf"}; ProcessBuilder pb = new ProcessBuilder(cmdString); pb.redirectErrorStream(true); Process proc = pb.start(); try { proc.waitFor();} catch (Exception e){} Log.i(TAG,"PDNSD: " + proc.exitValue()); if (proc.exitValue() != 0) { BufferedReader br = new BufferedReader(new InputStreamReader(proc.getInputStream())); String line = null; while ((line = br.readLine ()) != null) { Log.d(TAG,"pdnsd: " + line); } } } public static void makePdnsdConf(Context context, String dns, int port, File fileDir) throws FileNotFoundException { Loading @@ -429,20 +444,6 @@ public class OrbotVpnManager implements Handler.Callback { ps.print(conf); ps.close(); //f.withWriter { out -> out.print conf }; /** * server { label= "upstream"; ip = %s; port = %d; uptest = none; } */ File cache = new File(fileDir,"pdnsd.cache"); if (!cache.exists()) { Loading Loading
orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +19 −18 Original line number Diff line number Diff line Loading @@ -41,10 +41,13 @@ import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.transproxy.TorifiedApp; import org.torproject.android.service.util.TorServiceUtils; import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintStream; import java.net.InetAddress; import java.util.ArrayList; Loading Loading @@ -405,14 +408,26 @@ public class OrbotVpnManager implements Handler.Callback { ArrayList<String> customEnv = new ArrayList<String>(); String baseDirectory = filePdnsd.getParent(); String cmdString = "sh " + filePdnsd.getCanonicalPath() + " -c " + baseDirectory + "/pdnsd.conf"; Process proc = Runtime.getRuntime().exec(cmdString); String[] cmdString = {filePdnsd.getCanonicalPath(),"-c",baseDirectory + "/pdnsd.conf"}; ProcessBuilder pb = new ProcessBuilder(cmdString); pb.redirectErrorStream(true); Process proc = pb.start(); try { proc.waitFor();} catch (Exception e){} Log.i(TAG,"PDNSD: " + proc.exitValue()); if (proc.exitValue() != 0) { BufferedReader br = new BufferedReader(new InputStreamReader(proc.getInputStream())); String line = null; while ((line = br.readLine ()) != null) { Log.d(TAG,"pdnsd: " + line); } } } public static void makePdnsdConf(Context context, String dns, int port, File fileDir) throws FileNotFoundException { Loading @@ -429,20 +444,6 @@ public class OrbotVpnManager implements Handler.Callback { ps.print(conf); ps.close(); //f.withWriter { out -> out.print conf }; /** * server { label= "upstream"; ip = %s; port = %d; uptest = none; } */ File cache = new File(fileDir,"pdnsd.cache"); if (!cache.exists()) { Loading