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

Backends: print versions somewhere in log

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2018-06-02 19:26:33 +02:00
parent 4671f59c67
commit 567503abc7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/wireguard/android/backend/GoBackend.java
View File

@ -187,7 +187,7 @@ public final class GoBackend implements Backend {
try (final ParcelFileDescriptor tun = builder.establish()) { try (final ParcelFileDescriptor tun = builder.establish()) {
if (tun == null) if (tun == null)
throw new Exception("Unable to create tun device"); throw new Exception("Unable to create tun device");
Log.d(TAG, "Go backend v" + wgVersion());
currentTunnelHandle = wgTurnOn(tunnel.getName(), tun.detachFd(), goConfig); currentTunnelHandle = wgTurnOn(tunnel.getName(), tun.detachFd(), goConfig);
} }
if (currentTunnelHandle < 0) if (currentTunnelHandle < 0)

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

@ -109,8 +109,10 @@ public final class WgQuickBackend implements Backend {
try (final FileOutputStream stream = new FileOutputStream(tempFile, false)) { try (final FileOutputStream stream = new FileOutputStream(tempFile, false)) {
stream.write(config.toString().getBytes(StandardCharsets.UTF_8)); stream.write(config.toString().getBytes(StandardCharsets.UTF_8));
} }
final String command = String.format("wg-quick %s '%s'", String command = String.format("wg-quick %s '%s'",
state.toString().toLowerCase(), tempFile.getAbsolutePath()); state.toString().toLowerCase(), tempFile.getAbsolutePath());
if (state == State.UP)
command = "cat /sys/module/wireguard/version && " + command;
final int result = rootShell.run(null, command); final int result = rootShell.run(null, command);
// noinspection ResultOfMethodCallIgnored // noinspection ResultOfMethodCallIgnored
tempFile.delete(); tempFile.delete();