void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

Browse source
This commit is contained in:
Adam Ierymenko 2016-09-07 11:20:47 -07:00
commit a9f404aac3
2 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
java/jni/ZT_jniutils.cpp
View file

@ -371,7 +371,6 @@ jobject newPeerPhysicalPath(JNIEnv *env, const ZT_PeerPhysicalPath &ppp)
jfieldID addressField = NULL; jfieldID addressField = NULL;
jfieldID lastSendField = NULL; jfieldID lastSendField = NULL;
jfieldID lastReceiveField = NULL; jfieldID lastReceiveField = NULL;
jfieldID activeField = NULL;
jfieldID preferredField = NULL; jfieldID preferredField = NULL;
jmethodID ppp_constructor = NULL; jmethodID ppp_constructor = NULL;
@ -404,13 +403,6 @@ jobject newPeerPhysicalPath(JNIEnv *env, const ZT_PeerPhysicalPath &ppp)
return NULL; return NULL;
} }
activeField = lookup.findField(pppClass, "active", "Z");
if(env->ExceptionCheck() || activeField == NULL)
{
LOGE("Error finding active field");
return NULL;
}
preferredField = lookup.findField(pppClass, "preferred", "Z"); preferredField = lookup.findField(pppClass, "preferred", "Z");
if(env->ExceptionCheck() || preferredField == NULL) if(env->ExceptionCheck() || preferredField == NULL)
{ {
@ -441,7 +433,6 @@ jobject newPeerPhysicalPath(JNIEnv *env, const ZT_PeerPhysicalPath &ppp)
env->SetObjectField(pppObject, addressField, addressObject); env->SetObjectField(pppObject, addressField, addressObject);
env->SetLongField(pppObject, lastSendField, ppp.lastSend); env->SetLongField(pppObject, lastSendField, ppp.lastSend);
env->SetLongField(pppObject, lastReceiveField, ppp.lastReceive); env->SetLongField(pppObject, lastReceiveField, ppp.lastReceive);
env->SetBooleanField(pppObject, activeField, ppp.active);
env->SetBooleanField(pppObject, preferredField, ppp.preferred); env->SetBooleanField(pppObject, preferredField, ppp.preferred);
if(env->ExceptionCheck()) { if(env->ExceptionCheck()) {

8
java/src/com/zerotier/sdk/PeerPhysicalPath.java
View file

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