mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-04-26 05:49:59 +00:00
add implementations of compareTo() and equals() for VirtualNetworkRoute().
Android app was relying on these, but since they didn't exist, they didn't function properly
This commit is contained in:
parent
a54c2b438c
commit
e41d71cd19
@ -29,9 +29,14 @@ package com.zerotier.sdk;
|
|||||||
|
|
||||||
import java.net.InetSocketAddress;
|
import java.net.InetSocketAddress;
|
||||||
|
|
||||||
public final class VirtualNetworkRoute
|
public final class VirtualNetworkRoute implements Comparable<VirtualNetworkRoute>
|
||||||
{
|
{
|
||||||
private VirtualNetworkRoute() {}
|
private VirtualNetworkRoute() {
|
||||||
|
target = null;
|
||||||
|
via = null;
|
||||||
|
flags = 0;
|
||||||
|
metric = 0;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Target network / netmask bits (in port field) or NULL or 0.0.0.0/0 for default
|
* Target network / netmask bits (in port field) or NULL or 0.0.0.0/0 for default
|
||||||
@ -52,4 +57,46 @@ public final class VirtualNetworkRoute
|
|||||||
* Route metric (not currently used)
|
* Route metric (not currently used)
|
||||||
*/
|
*/
|
||||||
public int metric;
|
public int metric;
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int compareTo(VirtualNetworkRoute other) {
|
||||||
|
return target.toString().compareTo(other.target.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean equals(VirtualNetworkRoute other) {
|
||||||
|
boolean targetEquals;
|
||||||
|
if (target == null && other.target == null) {
|
||||||
|
targetEquals = true;
|
||||||
|
}
|
||||||
|
else if (target == null && other.target != null) {
|
||||||
|
targetEquals = false;
|
||||||
|
}
|
||||||
|
else if (target != null && other.target == null) {
|
||||||
|
targetEquals = false;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
targetEquals = target.equals(other.target);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
boolean viaEquals;
|
||||||
|
if (via == null && other.via == null) {
|
||||||
|
viaEquals = true;
|
||||||
|
}
|
||||||
|
else if (via == null && other.via != null) {
|
||||||
|
viaEquals = false;
|
||||||
|
}
|
||||||
|
else if (via != null && other.via == null) {
|
||||||
|
viaEquals = false;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
viaEquals = via.equals(other.via);
|
||||||
|
}
|
||||||
|
|
||||||
|
return viaEquals &&
|
||||||
|
viaEquals &&
|
||||||
|
flags == other.flags &&
|
||||||
|
metric == other.metric;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user