From ced040c5033bd61a963e65e8e8525459c4b8b59d Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Tue, 9 Jun 2015 19:38:05 -0700
Subject: Logging and adding .equals() methods to MulticastGroup and
 VirtualNetworkCofnig

---
 .../src/com/zerotier/sdk/VirtualNetworkConfig.java | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'java/src/com/zerotier/sdk/VirtualNetworkConfig.java')

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
      */
-- 
cgit v1.2.3


From adf89901c4d2de0d2338889a7fa1e5df1ab6b9be Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Fri, 19 Jun 2015 19:00:06 -0700
Subject: dont consider multicast groups in VirtualNetworkConfig.equals()

---
 java/src/com/zerotier/sdk/VirtualNetworkConfig.java | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'java/src/com/zerotier/sdk/VirtualNetworkConfig.java')

diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
index 35453ddc..980f48f7 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
@@ -55,18 +55,6 @@ 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) {
@@ -89,7 +77,7 @@ public final class VirtualNetworkConfig {
                broadcastEnabled == cfg.broadcastEnabled &&
                portError == cfg.portError &&
                enabled == cfg.enabled &&
-               mcgEqual && aaEqual;
+               aaEqual;
     }
 
     /**
-- 
cgit v1.2.3


From 759d71037ef429c0277d8bebe16cc4ac1f426c45 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Tue, 23 Jun 2015 23:03:02 -0700
Subject: added Comparable interface to VirtualNetworkConfig so we can sort
 arrays containing it.

---
 java/src/com/zerotier/sdk/VirtualNetworkConfig.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'java/src/com/zerotier/sdk/VirtualNetworkConfig.java')

diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
index 980f48f7..278fafd2 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
@@ -27,11 +27,13 @@
 
 package com.zerotier.sdk;
 
+import java.lang.Comparable;
+import java.lang.Override;
 import java.lang.String;
 import java.util.ArrayList;
 import java.net.InetSocketAddress;
 
-public final class VirtualNetworkConfig {
+public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConfig> {
     public static final int MAX_MULTICAST_SUBSCRIPTIONS = 4096;
     public static final int ZT1_MAX_ZT_ASSIGNED_ADDRESSES = 16;
 
@@ -80,6 +82,14 @@ public final class VirtualNetworkConfig {
                aaEqual;
     }
 
+    public int compareTo(VirtualNetworkConfig cfg) {
+        if(cfg.nwid == this.nwid) {
+            return 0;
+        } else {
+            return this.nwid > cfg.nwid ? 1 : -1;
+        }
+    }
+
     /**
      * 64-bit ZeroTier network ID
      */
-- 
cgit v1.2.3