update JNI code for 1.1.6

java/jni/Android.mk

@@ -16,7 +16,6 @@ LOCAL_SRC_FILES := \
 	$(ZT1)/node/C25519.cpp \
 	$(ZT1)/node/CertificateOfMembership.cpp \
 	$(ZT1)/node/DeferredPackets.cpp \
-	$(ZT1)/node/Dictionary.cpp \
 	$(ZT1)/node/Identity.cpp \
 	$(ZT1)/node/IncomingPacket.cpp \
 	$(ZT1)/node/InetAddress.cpp \

java/jni/ZT_jniutils.cpp

@@ -363,51 +363,6 @@ jobject newInetSocketAddress(JNIEnv *env, const sockaddr_storage &addr)
     return inetSocketAddressObject;
 }
 
-jobject newMulticastGroup(JNIEnv *env, const ZT_MulticastGroup &mc)
-{
-    jclass multicastGroupClass = NULL;
-    jmethodID multicastGroup_constructor = NULL;
-
-    jfieldID macField = NULL;
-    jfieldID adiField = NULL;
-
-    multicastGroupClass = lookup.findClass("com/zerotier/sdk/MulticastGroup");
-    if(env->ExceptionCheck() || multicastGroupClass == NULL)
-    {
-        return NULL;
-    }
-
-    multicastGroup_constructor = lookup.findMethod(
-        multicastGroupClass, "<init>", "()V");
-    if(env->ExceptionCheck() || multicastGroup_constructor == NULL)
-    {
-        return NULL;
-    }
-
-    jobject multicastGroupObj = env->NewObject(multicastGroupClass, multicastGroup_constructor);
-    if(env->ExceptionCheck() || multicastGroupObj == NULL)
-    {
-        return NULL;
-    }
-
-    macField = lookup.findField(multicastGroupClass, "mac", "J");
-    if(env->ExceptionCheck() || macField == NULL)
-    {
-        return NULL;
-    }
-
-    adiField = lookup.findField(multicastGroupClass, "adi", "J");
-    if(env->ExceptionCheck() || adiField == NULL)
-    {
-        return NULL;
-    }
-
-    env->SetLongField(multicastGroupObj, macField, mc.mac);
-    env->SetLongField(multicastGroupObj, adiField, mc.adi);
-
-    return multicastGroupObj;
-}
-
 jobject newPeerPhysicalPath(JNIEnv *env, const ZT_PeerPhysicalPath &ppp)
 {
     LOGV("newPeerPhysicalPath Called");
@@ -652,9 +607,7 @@ jobject newNetworkConfig(JNIEnv *env, const ZT_VirtualNetworkConfig &vnetConfig)
     jfieldID bridgeField = NULL;
     jfieldID broadcastEnabledField = NULL;
     jfieldID portErrorField = NULL;
-    jfieldID enabledField = NULL;
     jfieldID netconfRevisionField = NULL;
-    jfieldID multicastSubscriptionsField = NULL;
     jfieldID assignedAddressesField = NULL;
 
     vnetConfigClass = lookup.findClass("com/zerotier/sdk/VirtualNetworkConfig");
@@ -749,13 +702,6 @@ jobject newNetworkConfig(JNIEnv *env, const ZT_VirtualNetworkConfig &vnetConfig)
         return NULL;
     }
 
-    enabledField = lookup.findField(vnetConfigClass, "enabled", "Z");
-    if(env->ExceptionCheck() || enabledField == NULL)
-    {
-        LOGE("Error getting enabled field");
-        return NULL;
-    }
-
     netconfRevisionField = lookup.findField(vnetConfigClass, "netconfRevision", "J");
     if(env->ExceptionCheck() || netconfRevisionField == NULL)
     {
@@ -763,13 +709,6 @@ jobject newNetworkConfig(JNIEnv *env, const ZT_VirtualNetworkConfig &vnetConfig)
         return NULL;
     }
 
-    multicastSubscriptionsField = lookup.findField(vnetConfigClass, "multicastSubscriptions", "[Lcom/zerotier/sdk/MulticastGroup;");
-    if(env->ExceptionCheck() || multicastSubscriptionsField == NULL)
-    {
-        LOGE("Error getting multicastSubscriptions field");
-        return NULL;
-    }
-
     assignedAddressesField = lookup.findField(vnetConfigClass, "assignedAddresses", "[Ljava/net/InetSocketAddress;");
     if(env->ExceptionCheck() || assignedAddressesField == NULL)
     {
@@ -804,34 +743,8 @@ jobject newNetworkConfig(JNIEnv *env, const ZT_VirtualNetworkConfig &vnetConfig)
     env->SetBooleanField(vnetConfigObj, dhcpField, vnetConfig.dhcp);
     env->SetBooleanField(vnetConfigObj, bridgeField, vnetConfig.bridge);
     env->SetBooleanField(vnetConfigObj, broadcastEnabledField, vnetConfig.broadcastEnabled);
-    env->SetBooleanField(vnetConfigObj, enabledField, vnetConfig.enabled);
     env->SetIntField(vnetConfigObj, portErrorField, vnetConfig.portError);
 
-    jclass multicastGroupClass = lookup.findClass("com/zerotier/sdk/MulticastGroup");
-    if(env->ExceptionCheck() || multicastGroupClass == NULL) 
-    {
-        LOGE("Error finding MulticastGroup class");
-        return NULL;
-    }
-
-    jobjectArray mcastSubsArrayObj = env->NewObjectArray(
-        vnetConfig.multicastSubscriptionCount, multicastGroupClass, NULL);
-    if(env->ExceptionCheck() || mcastSubsArrayObj == NULL) {
-        LOGE("Error creating MulticastGroup[] array");
-        return NULL;
-    }
-
-    for(unsigned int i = 0; i < vnetConfig.multicastSubscriptionCount; ++i)
-    {
-        jobject mcastObj = newMulticastGroup(env, vnetConfig.multicastSubscriptions[i]);
-        env->SetObjectArrayElement(mcastSubsArrayObj, i, mcastObj);
-        if(env->ExceptionCheck())
-        {
-            LOGE("Error assigning MulticastGroup to array");
-        }
-    }
-    env->SetObjectField(vnetConfigObj, multicastSubscriptionsField, mcastSubsArrayObj);
-
     jclass inetSocketAddressClass = lookup.findClass("java/net/InetSocketAddress");
     if(env->ExceptionCheck() || inetSocketAddressClass == NULL)
     {
@@ -863,7 +776,7 @@ jobject newNetworkConfig(JNIEnv *env, const ZT_VirtualNetworkConfig &vnetConfig)
     return vnetConfigObj;
 }
 
-jobject newVersion(JNIEnv *env, int major, int minor, int rev, long featureFlags)
+jobject newVersion(JNIEnv *env, int major, int minor, int rev)
 {
    // create a com.zerotier.sdk.Version object
     jclass versionClass = NULL;
@@ -892,7 +805,6 @@ jobject newVersion(JNIEnv *env, int major, int minor, int rev, long featureFlags
     jfieldID majorField = NULL;
     jfieldID minorField = NULL;
     jfieldID revisionField = NULL;
-    jfieldID featureFlagsField = NULL;
 
     majorField = lookup.findField(versionClass, "major", "I");
     if(env->ExceptionCheck() || majorField == NULL)
@@ -912,16 +824,9 @@ jobject newVersion(JNIEnv *env, int major, int minor, int rev, long featureFlags
         return NULL;
     }
 
-    featureFlagsField = lookup.findField(versionClass, "featureFlags", "J");
-    if(env->ExceptionCheck() || featureFlagsField == NULL)
-    {
-        return NULL;
-    }
-
     env->SetIntField(versionObj, majorField, (jint)major);
     env->SetIntField(versionObj, minorField, (jint)minor);
     env->SetIntField(versionObj, revisionField, (jint)rev);
-    env->SetLongField(versionObj, featureFlagsField, (jlong)featureFlags); 
 
     return versionObj;
 }

java/jni/ZT_jniutils.h

@@ -40,7 +40,7 @@ jobject newPeerPhysicalPath(JNIEnv *env, const ZT_PeerPhysicalPath &ppp);
 
 jobject newNetworkConfig(JNIEnv *env, const ZT_VirtualNetworkConfig &config);
 
-jobject newVersion(JNIEnv *env, int major, int minor, int rev, long featureFlags);
+jobject newVersion(JNIEnv *env, int major, int minor, int rev);
 
 #ifdef __cplusplus
 }

java/jni/com_zerotierone_sdk_Node.cpp

@@ -1234,11 +1234,10 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_version(
     int major = 0;
     int minor = 0;
     int revision = 0;
-    unsigned long featureFlags = 0;
 
-    ZT_version(&major, &minor, &revision, &featureFlags);
+    ZT_version(&major, &minor, &revision);
 
-    return newVersion(env, major, minor, revision, featureFlags);
+    return newVersion(env, major, minor, revision);
 }
 
 /*

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;
-    }
-}

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;
 }

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)
      *