Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-27 11:25:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use IP address library

Browse Source
This commit is contained in:
M66B
2022-05-11 12:10:40 +02:00
parent d26ee2d300
commit cb2aea7c66
4 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/eu/faircode/email/ConnectionHelper.java
View File

@@ -59,6 +59,8 @@ import javax.net.SocketFactory;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
import inet.ipaddr.IPAddressString;
public class ConnectionHelper {
static final List<String> PREF_NETWORK = Collections.unmodifiableList(Arrays.asList(
"metered", "roaming", "rlah", "require_validated", "vpn_only" // update network state
@@ -558,23 +560,8 @@ public class ConnectionHelper {
static boolean inSubnet(final String ip, final String net, final int prefix) {
try {
byte[] _ip = InetAddress.getByName(ip).getAddress();
byte[] _net = InetAddress.getByName(net).getAddress();
if (_ip.length != _net.length)
return false;
int i = 0;
int p = prefix;
while (p >= 8) {
if (_ip[i] != _net[i])
return false;
++i;
p -= 8;
}
int m = (0xFF00 >> p) & 0xFF;
return (_ip[i] & m) == (_net[i] & m);
return new IPAddressString(net + "/" + prefix).getAddress()
.contains(new IPAddressString(ip).getAddress());
} catch (Throwable ex) {
Log.w(ex);
return false;