summaryrefslogtreecommitdiff
path: root/java/src/com/zerotier/sdk
diff options
context:
space:
mode:
authorGrant Limberg <glimberg@gmail.com>2015-06-09 19:38:05 -0700
committerGrant Limberg <glimberg@gmail.com>2015-06-09 19:38:05 -0700
commitced040c5033bd61a963e65e8e8525459c4b8b59d (patch)
treecb975050b40cfe488c82a875a619575af6abf37d /java/src/com/zerotier/sdk
parent7cc64c5cb69f2962d32ca41f6dc12499964d22a7 (diff)
downloadinfinitytier-ced040c5033bd61a963e65e8e8525459c4b8b59d.tar.gz
infinitytier-ced040c5033bd61a963e65e8e8525459c4b8b59d.zip
Logging and adding .equals() methods to MulticastGroup and VirtualNetworkCofnig
Diffstat (limited to 'java/src/com/zerotier/sdk')
-rw-r--r--java/src/com/zerotier/sdk/MulticastGroup.java4
-rw-r--r--java/src/com/zerotier/sdk/VirtualNetworkConfig.java38
2 files changed, 42 insertions, 0 deletions
diff --git a/java/src/com/zerotier/sdk/MulticastGroup.java b/java/src/com/zerotier/sdk/MulticastGroup.java
index 5c4df87a..68114424 100644
--- a/java/src/com/zerotier/sdk/MulticastGroup.java
+++ b/java/src/com/zerotier/sdk/MulticastGroup.java
@@ -33,6 +33,10 @@ public final class MulticastGroup {
private long mac;
private long adi;
+ public boolean equals(MulticastGroup other) {
+ return mac == other.mac && adi == other.adi;
+ }
+
/**
* MAC address (least significant 48 bits)
*/
diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
index 2be03acb..35453ddc 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
@@ -54,6 +54,44 @@ public final class VirtualNetworkConfig {
}
+ public boolean equals(VirtualNetworkConfig cfg) {
+ boolean mcgEqual = true;
+ if(multicastSubscriptions.length == cfg.multicastSubscriptions.length) {
+ for(int i = 0; i < multicastSubscriptions.length; ++i) {
+ if(!multicastSubscriptions[i].equals(cfg.multicastSubscriptions[i]))
+ {
+ return false;
+ }
+ }
+ } else {
+ mcgEqual = false;
+ }
+
+ boolean aaEqual = true;
+ if(assignedAddresses.length == cfg.assignedAddresses.length) {
+ for(int i = 0; i < assignedAddresses.length; ++i) {
+ if(!assignedAddresses[i].equals(cfg.assignedAddresses[i])) {
+ return false;
+ }
+ }
+ } else {
+ aaEqual = false;
+ }
+
+ return nwid == cfg.nwid &&
+ mac == cfg.mac &&
+ name.equals(cfg.name) &&
+ status.equals(cfg.status) &&
+ type.equals(cfg.type) &&
+ mtu == cfg.mtu &&
+ dhcp == cfg.dhcp &&
+ bridge == cfg.bridge &&
+ broadcastEnabled == cfg.broadcastEnabled &&
+ portError == cfg.portError &&
+ enabled == cfg.enabled &&
+ mcgEqual && aaEqual;
+ }
+
/**
* 64-bit ZeroTier network ID
*/