github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-07-07 13:31:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

make VirtualNetworkRoute a plain data class

Browse source
This commit is contained in:
Brenton Bostick 2023-02-01 06:43:32 -05:00
parent d0c0585553
commit 809022b273
4 changed files with 58 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

31
java/jni/ZT_jniutils.cpp
View file

@ -336,19 +336,34 @@ jobject newVersion(JNIEnv *env, int major, int minor, int rev)
jobject newVirtualNetworkRoute(JNIEnv *env, const ZT_VirtualNetworkRoute &route)
{
jobject routeObj = env->NewObject(VirtualNetworkRoute_class, VirtualNetworkRoute_ctor);
if(env->ExceptionCheck() || routeObj == NULL)
{
//
// may be NULL
//
jobject targetObj = newInetSocketAddress(env, route.target);
if (env->ExceptionCheck()) {
return NULL;
}
jobject targetObj = newInetSocketAddress(env, route.target);
//
// may be NULL
//
jobject viaObj = newInetSocketAddress(env, route.via);
if (env->ExceptionCheck()) {
return NULL;
}
env->SetObjectField(routeObj, VirtualNetworkRoute_target_field, targetObj);
env->SetObjectField(routeObj, VirtualNetworkRoute_via_field, viaObj);
env->SetIntField(routeObj, VirtualNetworkRoute_flags_field, (jint)route.flags);
env->SetIntField(routeObj, VirtualNetworkRoute_metric_field, (jint)route.metric);
jobject routeObj = env->NewObject(
VirtualNetworkRoute_class,
VirtualNetworkRoute_ctor,
targetObj,
viaObj,
route.flags,
route.metric);
if(env->ExceptionCheck() || routeObj == NULL)
{
LOGE("Exception creating VirtualNetworkRoute");
return NULL;
}
return routeObj;
}