IPV6 update

zerotierone/java/src/com/zerotier/sdk/MulticastGroup.java

@@ -1,53 +0,0 @@
-/*
- * ZeroTier One - Network Virtualization Everywhere
- * Copyright (C) 2011-2015  ZeroTier, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * --
- *
- * ZeroTier may be used and distributed under the terms of the GPLv3, which
- * are available at: http://www.gnu.org/licenses/gpl-3.0.html
- *
- * If you would like to embed ZeroTier into a commercial application or
- * redistribute it in a modified binary form, please contact ZeroTier Networks
- * LLC. Start here: http://www.zerotier.com/
- */
-package com.zerotier.sdk;
-
-
-public final class MulticastGroup {
-    private 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)
-     */
-    public final long getMacAddress() {
-        return mac;
-    }
-
-    /**
-     * Additional distinguishing information (usually zero)
-     */
-    public final long getAdi() {
-        return adi;
-    }
-}

zerotierone/java/src/com/zerotier/sdk/PeerPhysicalPath.java

@@ -37,7 +37,6 @@ public final class PeerPhysicalPath {
     private long lastSend;
     private long lastReceive;
     private boolean fixed;
-    private boolean active;
     private boolean preferred;
 
     private PeerPhysicalPath() {}
@@ -70,13 +69,6 @@ public final class PeerPhysicalPath {
         return fixed;
     }
 
-    /**
-     * Is path active?
-     */
-    public final boolean isActive() {
-        return active;
-    }
-
     /**
      * Is path preferred?
      */

zerotierone/java/src/com/zerotier/sdk/PeerRole.java

@@ -34,9 +34,9 @@ public enum PeerRole {
     PEER_ROLE_LEAF,
 
     /**
-     * relay node
+     * upstream node
      */
-    PEER_ROLE_RELAY,
+    PEER_ROLE_UPSTREAM,
 
     /**
      * root server

zerotierone/java/src/com/zerotier/sdk/Version.java

@@ -33,5 +33,4 @@ public final class Version {
 	public int major = 0;
 	public int minor = 0;
 	public int revision = 0;
-	public long featureFlags = 0;
 }

zerotierone/java/src/com/zerotier/sdk/VirtualNetworkConfig.java

@@ -49,8 +49,8 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf
     private int portError;
     private boolean enabled;
     private long netconfRevision;
-    private MulticastGroup[] multicastSubscriptions;
     private InetSocketAddress[] assignedAddresses;
+    private VirtualNetworkRoute[] routes;
 
     private VirtualNetworkConfig() {
 
@@ -61,13 +61,24 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf
         if(assignedAddresses.length == cfg.assignedAddresses.length) {
             for(int i = 0; i < assignedAddresses.length; ++i) {
                 if(!assignedAddresses[i].equals(cfg.assignedAddresses[i])) {
-                    return false;
+                    aaEqual = false;
                 }
             }
         } else {
             aaEqual = false;
         }
 
+        boolean routesEqual = true;
+        if(routes.length == cfg.routes.length) {
+            for (int i = 0; i < routes.length; ++i) {
+                if (!routes[i].equals(cfg.routes[i])) {
+                    routesEqual = false;
+                }
+            }
+        } else {
+            routesEqual = false;
+        }
+
         return nwid == cfg.nwid &&
                mac == cfg.mac &&
                name.equals(cfg.name) &&
@@ -79,7 +90,7 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf
                broadcastEnabled == cfg.broadcastEnabled &&
                portError == cfg.portError &&
                enabled == cfg.enabled &&
-               aaEqual;
+               aaEqual && routesEqual;
     }
 
     public int compareTo(VirtualNetworkConfig cfg) {
@@ -167,13 +178,6 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf
         return portError;
     }
 
-    /**
-     * Is this network enabled? If not, all frames to/from are dropped.
-     */
-    public final boolean isEnabled() {
-        return enabled;
-    }
-
     /**
      * Network config revision as reported by netconf master
      *
@@ -183,13 +187,6 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf
         return netconfRevision;
     }
 
-    /**
-     * Multicast group subscriptions
-     */
-    public final MulticastGroup[] multicastSubscriptions() {
-        return multicastSubscriptions;
-    }
-
     /**
      * ZeroTier-assigned addresses (in {@link java.net.InetSocketAddress} objects)
      *
@@ -203,4 +200,11 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf
     public final InetSocketAddress[] assignedAddresses() {
         return assignedAddresses;
     }
+
+    /**
+     * ZeroTier-assigned routes (in {@link com.zerotier.sdk.VirtualNetworkRoute} objects)
+     *
+     * @return
+     */
+    public final VirtualNetworkRoute[] routes() { return routes; }
 }