dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

newInetAddress and newInetSocketAddress work

Browse source 
allow newInetSocketAddress to return NULL if given empty address
This commit is contained in:
Brenton Bostick 2023-02-01 16:01:16 -05:00
parent e1c16a8e68
commit 132bff25df
2 changed files with 27 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

35
java/jni/com_zerotierone_sdk_Node.cpp
View file

@ -414,12 +414,18 @@ namespace {
return -100;
}
//
// may be NULL
//
jobject remoteAddressObj = newInetSocketAddress(env, *remoteAddress);
if (env->ExceptionCheck()) {
return -101;
}
const unsigned char *bytes = static_cast<const unsigned char *>(buffer);
jbyteArray bufferObj = newByteArray(env, bytes, bufferSize);
if (env->ExceptionCheck() || bufferObj == NULL)
{
return -101;
return -102;
}
int retval = env->CallIntMethod(ref->packetSender, PacketSender_onSendPacketRequested_method, localSocket, remoteAddressObj, bufferObj);
@ -446,30 +452,11 @@ namespace {
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
//
// was:
// struct sockaddr_storage nullAddress = {0};
// may be NULL
//
// but was getting this warning:
// warning: suggest braces around initialization of subobject
//
// when building ZeroTierOne
//
struct sockaddr_storage nullAddress;
//
// It is possible to assume knowledge about internals of sockaddr_storage and construct
// correct 0-initializer, but it is simpler to just treat sockaddr_storage as opaque and
// use memset here to fill with 0
//
// This is also done in InetAddress.hpp for InetAddress
//
memset(&nullAddress, 0, sizeof(sockaddr_storage));
jobject remoteAddressObj = NULL;
if(memcmp(remoteAddress, &nullAddress, sizeof(sockaddr_storage)) != 0)
{
remoteAddressObj = newInetSocketAddress(env, *remoteAddress);
jobject remoteAddressObj = newInetSocketAddress(env, *remoteAddress);
if (env->ExceptionCheck()) {
return true;
}
return env->CallBooleanMethod(ref->pathChecker, PathChecker_onPathCheck_method, address, localSocket, remoteAddressObj);