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

fix ANDROID-38: stack corruption in onSendPacketRequested

Browse source
This commit is contained in:
Brenton Bostick 2023-02-02 11:34:18 -05:00
parent 132bff25df
commit 0a925a6f21
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
java/jni/com_zerotierone_sdk_Node.cpp
View file

@ -402,7 +402,7 @@ namespace {
unsigned int bufferSize, unsigned int bufferSize,
unsigned int ttl) unsigned int ttl)
{ {
LOGV("WirePacketSendFunction(%lld, %p, %p, %d)", (long long)localSocket, remoteAddress, buffer, bufferSize); LOGV("WirePacketSendFunction(%lld, %p, %p, %d, %u)", (long long)localSocket, remoteAddress, buffer, bufferSize, ttl);
JniRef *ref = (JniRef*)userData; JniRef *ref = (JniRef*)userData;
assert(ref->node == node); assert(ref->node == node);
@ -428,7 +428,7 @@ namespace {
return -102; return -102;
} }
int retval = env->CallIntMethod(ref->packetSender, PacketSender_onSendPacketRequested_method, localSocket, remoteAddressObj, bufferObj); int retval = env->CallIntMethod(ref->packetSender, PacketSender_onSendPacketRequested_method, localSocket, remoteAddressObj, bufferObj, 0);
LOGV("JNI Packet Sender returned: %d", retval); LOGV("JNI Packet Sender returned: %d", retval);
return retval; return retval;

1
java/src/com/zerotier/sdk/PacketSender.java
View file

@ -42,6 +42,7 @@ public interface PacketSender {
* @param localSocket socket file descriptor to send from. Set to -1 if not specified. * @param localSocket socket file descriptor to send from. Set to -1 if not specified.
* @param remoteAddr {@link InetSocketAddress} to send to * @param remoteAddr {@link InetSocketAddress} to send to
* @param packetData data to send * @param packetData data to send
* @param ttl TTL is ignored
* @return 0 on success, any error code on failure. * @return 0 on success, any error code on failure.
*/ */
public int onSendPacketRequested( public int onSendPacketRequested(