Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WgQuickBackend: always create configuration file

Browse Source 
It might be removed on an update.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2018-04-26 19:41:35 +02:00
parent 8d2510ae9e
commit 31101f2418
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
View File

@ -100,17 +100,12 @@ public final class WgQuickBackend implements Backend {
private void setStateInternal(final Tunnel tunnel, final Config config, final State state) private void setStateInternal(final Tunnel tunnel, final Config config, final State state)
throws Exception { throws Exception {
final File tempFile = new File(localTemporaryDir, tunnel.getName() + ".conf"); final File tempFile = new File(localTemporaryDir, tunnel.getName() + ".conf");
final int result;
if (state == State.UP) {
try (FileOutputStream stream = new FileOutputStream(tempFile, false)) { try (FileOutputStream stream = new FileOutputStream(tempFile, false)) {
stream.write(config.toString().getBytes(StandardCharsets.UTF_8)); stream.write(config.toString().getBytes(StandardCharsets.UTF_8));
} }
result = rootShell.run(null, "wg-quick up '" + tempFile.getAbsolutePath() + '\''); final String command = String.format("wg-quick %s '%s'", state.toString().toLowerCase(), tempFile.getAbsolutePath());
} else { final int result = rootShell.run(null, command);
result = rootShell.run(null, "wg-quick down '" + tempFile.getAbsolutePath() + '\''); tempFile.delete();
if (result == 0 && !tempFile.delete())
Log.w(TAG, "Couldn't delete temp config after bringing down " + tunnel.getName());
}
if (result != 0) if (result != 0)
throw new Exception("Unable to configure tunnel (wg-quick returned " + result + ')'); throw new Exception("Unable to configure tunnel (wg-quick returned " + result + ')');
} }