소스 검색

Reflect changes to strut ZT_PeerPhysicalPath

Grant Limberg 9 년 전
부모
커밋
407ad659ea
2개의 변경된 파일0개의 추가작업 그리고 17개의 파일을 삭제
  1. 0 9
      java/jni/ZT_jniutils.cpp
  2. 0 8
      java/src/com/zerotier/sdk/PeerPhysicalPath.java

+ 0 - 9
java/jni/ZT_jniutils.cpp

@@ -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()) {

+ 0 - 8
java/src/com/zerotier/sdk/PeerPhysicalPath.java

@@ -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?
      */
      */