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

WgQuickBackend: Improve error handling

Browse Source 
Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Samuel Holland 2018-01-08 04:15:15 -06:00
parent ec81014c4e
commit 668d90f063
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,8 @@
package com.wireguard.android.backend; package com.wireguard.android.backend;
import android.content.Context; import android.content.Context;
import android.system.ErrnoException;
import android.system.OsConstants;
import android.util.Log; import android.util.Log;
import com.wireguard.android.model.Tunnel; import com.wireguard.android.model.Tunnel;
@ -10,7 +12,6 @@ import com.wireguard.android.util.RootShell;
import com.wireguard.config.Config; import com.wireguard.config.Config;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -69,18 +70,26 @@ public final class WgQuickBackend implements Backend {
} }
@Override @Override
public State setState(final Tunnel tunnel, final State state) throws IOException { public State setState(final Tunnel tunnel, final State state) throws Exception {
Log.v(TAG, "Requested state change to " + state + " for tunnel " + tunnel.getName()); Log.v(TAG, "Requested state change to " + state + " for tunnel " + tunnel.getName());
final State originalState = getState(tunnel); final State originalState = getState(tunnel);
final State resolvedState = resolveState(originalState, state); final State resolvedState = resolveState(originalState, state);
if (resolvedState == originalState)
return originalState;
final int result;
if (resolvedState == State.UP) { if (resolvedState == State.UP) {
if (!new File("/sys/module/wireguard").exists())
throw new ErrnoException("WireGuard module not loaded", OsConstants.ENODEV);
// FIXME: Assumes file layout from FileConfigStore. Use a temporary file. // FIXME: Assumes file layout from FileConfigStore. Use a temporary file.
final File file = new File(context.getFilesDir(), tunnel.getName() + ".conf"); final File file = new File(context.getFilesDir(), tunnel.getName() + ".conf");
if (rootShell.run(null, String.format("wg-quick up '%s'", file.getAbsolutePath())) != 0) result = rootShell.run(null, String.format("wg-quick up '%s'", file.getAbsolutePath()));
throw new IOException("wg-quick failed");
} else { } else {
if (rootShell.run(null, String.format("wg-quick down '%s'", tunnel.getName())) != 0) result = rootShell.run(null, String.format("wg-quick down '%s'", tunnel.getName()));
throw new IOException("wg-quick failed"); }
if (result != 0) {
final String message = result == OsConstants.EACCES ?
"Root access unavailable" : "wg-quick failed";
throw new Exception(message);
} }
return getState(tunnel); return getState(tunnel);
} }