diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-12-25 23:51:48 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-12-25 23:51:48 +0100 |
| commit | 367fd28be00e541f251854893b0eeeb5168e59d3 (patch) | |
| tree | 53da64ff70568f46a271cc8a916130b1b8f7239e /src/de/blinkt/openvpn/ConfigParser.java | |
| parent | c1d78fac8eefc4f8c4eaab7b91bf54698fe29466 (diff) | |
| parent | c9dc454f4ec38f075f951fbf32935054023eed94 (diff) | |
Merge again
Diffstat (limited to 'src/de/blinkt/openvpn/ConfigParser.java')
| -rw-r--r-- | src/de/blinkt/openvpn/ConfigParser.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/de/blinkt/openvpn/ConfigParser.java b/src/de/blinkt/openvpn/ConfigParser.java index f2814f7e..cdec964e 100644 --- a/src/de/blinkt/openvpn/ConfigParser.java +++ b/src/de/blinkt/openvpn/ConfigParser.java @@ -4,6 +4,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.Reader; import java.util.HashMap; import java.util.Locale; import java.util.Vector; @@ -18,11 +19,10 @@ public class ConfigParser { private HashMap<String, Vector<Vector<String>>> options = new HashMap<String, Vector<Vector<String>>>(); - public void parseConfig(InputStream inputStream) throws IOException, ConfigParseError { + public void parseConfig(Reader reader) throws IOException, ConfigParseError { - InputStreamReader fr = new InputStreamReader(inputStream); - BufferedReader br =new BufferedReader(fr); + BufferedReader br =new BufferedReader(reader); @SuppressWarnings("unused") int lineno=0; @@ -230,9 +230,9 @@ public class ConfigParser { "route-gateway", "route-metric", "route-method", + "status", "script-security", "show-net-up", - "status", "suppress-timestamps", "tmp-dir", "tun-ipv6", |