ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-25 23:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update JNI wrapper to reflect removal of lastMulticastFrame and lastUnicastFrame from ZT_Peer struct

Browse Source
This commit is contained in:
Grant Limberg 2016-11-09 16:33:01 -08:00
parent c61ca1dea2
commit e1c930f1b7
2 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
java/jni/ZT_jniutils.cpp
View File

@ -475,8 +475,6 @@ jobject newPeer(JNIEnv *env, const ZT_Peer &peer)
jclass peerClass = NULL; jclass peerClass = NULL;
jfieldID addressField = NULL; jfieldID addressField = NULL;
jfieldID lastUnicastFrameField = NULL;
jfieldID lastMulticastFrameField = NULL;
jfieldID versionMajorField = NULL; jfieldID versionMajorField = NULL;
jfieldID versionMinorField = NULL; jfieldID versionMinorField = NULL;
jfieldID versionRevField = NULL; jfieldID versionRevField = NULL;
@ -500,20 +498,6 @@ jobject newPeer(JNIEnv *env, const ZT_Peer &peer)
return NULL; return NULL;
} }
lastUnicastFrameField = lookup.findField(peerClass, "lastUnicastFrame", "J");
if(env->ExceptionCheck() || lastUnicastFrameField == NULL)
{
LOGE("Error finding lastUnicastFrame field of Peer object");
return NULL;
}
lastMulticastFrameField = lookup.findField(peerClass, "lastMulticastFrame", "J");
if(env->ExceptionCheck() || lastMulticastFrameField == NULL)
{
LOGE("Error finding lastMulticastFrame field of Peer object");
return NULL;
}
versionMajorField = lookup.findField(peerClass, "versionMajor", "I"); versionMajorField = lookup.findField(peerClass, "versionMajor", "I");
if(env->ExceptionCheck() || versionMajorField == NULL) if(env->ExceptionCheck() || versionMajorField == NULL)
{ {
@ -571,8 +555,6 @@ jobject newPeer(JNIEnv *env, const ZT_Peer &peer)
} }
env->SetLongField(peerObject, addressField, (jlong)peer.address); env->SetLongField(peerObject, addressField, (jlong)peer.address);
env->SetLongField(peerObject, lastUnicastFrameField, (jlong)peer.lastUnicastFrame);
env->SetLongField(peerObject, lastMulticastFrameField, (jlong)peer.lastMulticastFrame);
env->SetIntField(peerObject, versionMajorField, peer.versionMajor); env->SetIntField(peerObject, versionMajorField, peer.versionMajor);
env->SetIntField(peerObject, versionMinorField, peer.versionMinor); env->SetIntField(peerObject, versionMinorField, peer.versionMinor);
env->SetIntField(peerObject, versionRevField, peer.versionRev); env->SetIntField(peerObject, versionRevField, peer.versionRev);

16
java/src/com/zerotier/sdk/Peer.java
View File

@ -34,8 +34,6 @@ import java.util.ArrayList;
*/ */
public final class Peer { public final class Peer {
private long address; private long address;
private long lastUnicastFrame;
private long lastMulticastFrame;
private int versionMajor; private int versionMajor;
private int versionMinor; private int versionMinor;
private int versionRev; private int versionRev;
@ -52,20 +50,6 @@ public final class Peer {
return address; return address;
} }
/**
* Time we last received a unicast frame from this peer
*/
public final long lastUnicastFrame() {
return lastUnicastFrame;
}
/**
* Time we last received a multicast rame from this peer
*/
public final long lastMulticastFrame() {
return lastMulticastFrame;
}
/** /**
* Remote major version or -1 if not known * Remote major version or -1 if not known
*/ */