From be0af135bc2fa1d517f592fe22a004a62d1d9e9e Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Thu, 7 Jul 2016 20:07:07 -0700
Subject: update JNI code for 1.1.6

---
 java/src/com/zerotier/sdk/MulticastGroup.java      | 53 ----------------------
 java/src/com/zerotier/sdk/Version.java             |  1 -
 .../src/com/zerotier/sdk/VirtualNetworkConfig.java | 15 ------
 3 files changed, 69 deletions(-)
 delete mode 100644 java/src/com/zerotier/sdk/MulticastGroup.java

(limited to 'java/src')

diff --git a/java/src/com/zerotier/sdk/MulticastGroup.java b/java/src/com/zerotier/sdk/MulticastGroup.java
deleted file mode 100644
index 68114424..00000000
--- a/java/src/com/zerotier/sdk/MulticastGroup.java
+++ /dev/null
@@ -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;
-    }
-}
diff --git a/java/src/com/zerotier/sdk/Version.java b/java/src/com/zerotier/sdk/Version.java
index d7fa0ce4..c93c2597 100644
--- a/java/src/com/zerotier/sdk/Version.java
+++ b/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;
 }
\ No newline at end of file
diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
index 9816180b..fbcbd3a4 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
@@ -49,7 +49,6 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf
     private int portError;
     private boolean enabled;
     private long netconfRevision;
-    private MulticastGroup[] multicastSubscriptions;
     private InetSocketAddress[] assignedAddresses;
 
     private VirtualNetworkConfig() {
@@ -167,13 +166,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 +175,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)
      *
-- 
cgit v1.2.3