aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2020-03-13 13:20:21 -0600
committerJason A. Donenfeld <Jason@zx2c4.com>2020-03-13 13:20:34 -0600
commitf5d2fd61904e0b1e1828331009d5be62851d7371 (patch)
treeaf7ee32f8c76546898a0dbd0b935336018126b85
parentstrings: update Simplified Chinese translation (diff)
downloadwireguard-android-f5d2fd61904e0b1e1828331009d5be62851d7371.tar.xz
wireguard-android-f5d2fd61904e0b1e1828331009d5be62851d7371.zip
config: show missing section error correctly
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--tunnel/src/main/java/com/wireguard/config/Config.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/tunnel/src/main/java/com/wireguard/config/Config.java b/tunnel/src/main/java/com/wireguard/config/Config.java
index c45dccb..df344b1 100644
--- a/tunnel/src/main/java/com/wireguard/config/Config.java
+++ b/tunnel/src/main/java/com/wireguard/config/Config.java
@@ -69,6 +69,7 @@ public final class Config {
final Collection<String> peerLines = new ArrayList<>();
boolean inInterfaceSection = false;
boolean inPeerSection = false;
+ boolean seenInterfaceSection = false;
@Nullable String line;
while ((line = reader.readLine()) != null) {
final int commentIndex = line.indexOf('#');
@@ -86,6 +87,7 @@ public final class Config {
if ("[Interface]".equalsIgnoreCase(line)) {
inInterfaceSection = true;
inPeerSection = false;
+ seenInterfaceSection = true;
} else if ("[Peer]".equalsIgnoreCase(line)) {
inInterfaceSection = false;
inPeerSection = true;
@@ -104,7 +106,7 @@ public final class Config {
}
if (inPeerSection)
builder.parsePeer(peerLines);
- else if (!inInterfaceSection)
+ if (!seenInterfaceSection)
throw new BadConfigException(Section.CONFIG, Location.TOP_LEVEL,
Reason.MISSING_SECTION, null);
// Combine all [Interface] sections in the file.