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

invert logic in a couple of places and return early

Browse source
This commit is contained in:
Brenton Bostick 2023-02-01 11:19:01 -05:00
parent 4ee73fa272
commit e1c16a8e68
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
java/jni/ZT_jniutils.cpp
View file

@ -175,22 +175,18 @@ jobject newInetSocketAddress(JNIEnv *env, const sockaddr_storage &addr)
{ {
LOGV("newInetSocketAddress Called"); LOGV("newInetSocketAddress Called");
jobject inetAddressObject = NULL; if(addr.ss_family == 0)
if(addr.ss_family != 0)
{ {
inetAddressObject = newInetAddress(env, addr); return NULL;
}
jobject inetAddressObject = newInetAddress(env, addr);
if(env->ExceptionCheck() || inetAddressObject == NULL) if(env->ExceptionCheck() || inetAddressObject == NULL)
{ {
LOGE("Error creating new inet address"); LOGE("Error creating new inet address");
return NULL; return NULL;
} }
}
else
{
return NULL;
}
int port = 0; int port = 0;
switch(addr.ss_family) switch(addr.ss_family)

5
java/jni/com_zerotierone_sdk_Node.cpp
View file

@ -233,12 +233,13 @@ namespace {
case ZT_EVENT_TRACE: { case ZT_EVENT_TRACE: {
LOGV("Trace Event"); LOGV("Trace Event");
// call onTrace() // call onTrace()
if (data != NULL) { if (data == NULL) {
break;
}
const char *message = (const char *) data; const char *message = (const char *) data;
jstring messageStr = env->NewStringUTF(message); jstring messageStr = env->NewStringUTF(message);
env->CallVoidMethod(ref->eventListener, EventListener_onTrace_method, messageStr); env->CallVoidMethod(ref->eventListener, EventListener_onTrace_method, messageStr);
} }
}
break; break;
case ZT_EVENT_USER_MESSAGE: case ZT_EVENT_USER_MESSAGE:
case ZT_EVENT_REMOTE_TRACE: case ZT_EVENT_REMOTE_TRACE: