mirror of
https://github.com/schwabe/ics-openvpn.git
synced 2024-09-19 19:42:29 +02:00
Silently ignore parsing error if DNS server looks like IPv6 (and hope that Samsung only screwed up IPv4)
This commit is contained in:
parent
84ec02a142
commit
ec8652603d
@ -1,6 +1,5 @@
|
|||||||
<component name="CopyrightManager">
|
<component name="CopyrightManager">
|
||||||
<copyright>
|
<copyright>
|
||||||
<option name="allowReplaceRegexp" value="Copyright \(c\) 2012\-2016Arne Schwabe" />
|
|
||||||
<option name="myName" value="ics-openvpn-gpl" />
|
<option name="myName" value="ics-openvpn-gpl" />
|
||||||
<option name="notice" value="Copyright (c) 2012-&#36;{today.year} Arne Schwabe Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt" />
|
<option name="notice" value="Copyright (c) 2012-&#36;{today.year} Arne Schwabe Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt" />
|
||||||
</copyright>
|
</copyright>
|
||||||
|
@ -19,9 +19,9 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile 'com.android.support:support-annotations:25.4.0'
|
compile 'com.android.support:support-annotations:26.0.0'
|
||||||
compile 'com.android.support:cardview-v7:25.4.0'
|
compile 'com.android.support:cardview-v7:26.0.0'
|
||||||
compile 'com.android.support:recyclerview-v7:25.4.0'
|
compile 'com.android.support:recyclerview-v7:26.0.0'
|
||||||
// compile 'ch.acra:acra:4.5.0'
|
// compile 'ch.acra:acra:4.5.0'
|
||||||
compile 'com.github.PhilJay:MPAndroidChart:v3.0.2'
|
compile 'com.github.PhilJay:MPAndroidChart:v3.0.2'
|
||||||
|
|
||||||
|
@ -764,6 +764,8 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
|
|||||||
positiveIPv4Routes.add(dnsServer);
|
positiveIPv4Routes.add(dnsServer);
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
// If it looks like IPv6 ignore error
|
||||||
|
if (!mDnslist.get(0).contains(":"))
|
||||||
VpnStatus.logError("Error parsing DNS Server IP: " + mDnslist.get(0));
|
VpnStatus.logError("Error parsing DNS Server IP: " + mDnslist.get(0));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user