From 9c038d3ecd568ea62857f662a346a7db72778a1f Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Wed, 22 Apr 2015 19:36:46 -0700 Subject: [PATCH] added a few missing function calls in the ZT1 Node API Signed-off-by: Grant Limberg --- java/jni/com_zerotierone_sdk_Node.h | 24 ++++++++++++++++++++++ java/src/com/zerotierone/sdk/Node.java | 28 ++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/java/jni/com_zerotierone_sdk_Node.h b/java/jni/com_zerotierone_sdk_Node.h index 4682fa51e..a5c3b4d29 100644 --- a/java/jni/com_zerotierone_sdk_Node.h +++ b/java/jni/com_zerotierone_sdk_Node.h @@ -87,6 +87,30 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_multicastUnsubscribe JNIEXPORT jlong JNICALL Java_com_zerotierone_sdk_Node_address (JNIEnv *, jobject, jlong); +/* + * Class: com_zerotierone_sdk_Node + * Method: status + * Signature: (J)Lcom/zerotierone/sdk/NodeStatus; + */ +JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_status + (JNIEnv *, jobject, jlong); + +/* + * Class: com_zerotierone_sdk_Node + * Method: networkConfig + * Signature: (J)Lcom/zerotierone/sdk/VirtualNetworkConfig; + */ +JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_networkConfig + (JNIEnv *, jobject, jlong); + +/* + * Class: com_zerotierone_sdk_Node + * Method: version + * Signature: (J)Lcom/zerotierone/sdk/Version; + */ +JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_version + (JNIEnv *, jobject, jlong); + #ifdef __cplusplus } #endif diff --git a/java/src/com/zerotierone/sdk/Node.java b/java/src/com/zerotierone/sdk/Node.java index 61150dc9d..616951cbf 100644 --- a/java/src/com/zerotierone/sdk/Node.java +++ b/java/src/com/zerotierone/sdk/Node.java @@ -153,6 +153,22 @@ public class Node { return address(nodeId); } + public NodeStatus status() { + return status(nodeId); + } + + // TODO: ZT1_Node_peers + + public VirtualNetworkConfig networkConfig() { + return networkConfig(nodeId); + } + + // TODO: ZT1_Node_networks + + public Version version() { + return version(nodeId); + } + /** * function declarations for JNI */ @@ -201,4 +217,16 @@ public class Node { long multicastAdi); private native long address(long nodeId); + + private native NodeStatus status(long nodeId); + + // TODO: ZT1_Node_peers + + private native VirtualNetworkConfig networkConfig(long nodeId); + + // TODO: ZT1_Node_networks + + private native Version version(long nodeId); + + } \ No newline at end of file