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

ProfileService: Use wg to enumerate interfaces

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Samuel Holland 2017-07-31 23:11:18 -05:00
parent b324e7b7f1
commit 544812b2a7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/wireguard/android/ProfileService.java
View File

@ -16,6 +16,7 @@ import java.io.FileOutputStream;
import java.io.FilenameFilter; import java.io.FilenameFilter;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@ -132,8 +133,13 @@ public class ProfileService extends Service {
protected List<Profile> doInBackground(File... files) { protected List<Profile> doInBackground(File... files) {
final List<String> interfaceNames = new LinkedList<>(); final List<String> interfaceNames = new LinkedList<>();
final List<Profile> loadedProfiles = new LinkedList<>(); final List<Profile> loadedProfiles = new LinkedList<>();
final String command = "ip -br link show type wireguard | cut -d' ' -f1"; final String command = "wg show interfaces";
if (RootShell.run(interfaceNames, command) != 0) { if (RootShell.run(interfaceNames, command) == 0 && interfaceNames.size() == 1) {
// wg puts all interface names on the same line. Split them into separate elements.
final String nameList = interfaceNames.get(0);
Collections.addAll(interfaceNames, nameList.split(" "));
interfaceNames.remove(0);
} else {
interfaceNames.clear(); interfaceNames.clear();
Log.w(TAG, "Can't enumerate network interfaces. All profiles will appear down."); Log.w(TAG, "Can't enumerate network interfaces. All profiles will appear down.");
} }