jyapayne/moonlight-common-c
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Batch split UTF-8 packets at the ENet layer

Browse source
This commit is contained in:
Cameron Gutman 2023-10-11 01:18:12 -05:00
commit 836bc6611f
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/InputStream.c
View file

@ -211,7 +211,7 @@ static PPACKET_HOLDER allocatePacketHolder(int extraLength) {
} }
} }
static bool sendInputPacket(PPACKET_HOLDER holder) { static bool sendInputPacket(PPACKET_HOLDER holder, bool moreData) {
SOCK_RET err; SOCK_RET err;
// On GFE 3.22, the entire control stream is encrypted (and support for separate RI encrypted) // On GFE 3.22, the entire control stream is encrypted (and support for separate RI encrypted)
@ -222,7 +222,7 @@ static bool sendInputPacket(PPACKET_HOLDER holder) {
PACKET_SIZE(holder), PACKET_SIZE(holder),
holder->channelId, holder->channelId,
holder->enetPacketFlags, holder->enetPacketFlags,
LbqGetItemCount(&packetQueue) > 0); moreData);
if (err < 0) { if (err < 0) {
Limelog("Input: sendInputPacketOnControlStream() failed: %d\n", (int) err); Limelog("Input: sendInputPacketOnControlStream() failed: %d\n", (int) err);
ListenerCallbacks.connectionTerminated(err); ListenerCallbacks.connectionTerminated(err);
@ -273,7 +273,7 @@ static bool sendInputPacket(PPACKET_HOLDER holder) {
(int)(encryptedSize + sizeof(encryptedLengthPrefix)), (int)(encryptedSize + sizeof(encryptedLengthPrefix)),
holder->channelId, holder->channelId,
holder->enetPacketFlags, holder->enetPacketFlags,
LbqGetItemCount(&packetQueue) > 0); moreData);
if (err < 0) { if (err < 0) {
Limelog("Input: sendInputPacketOnControlStream() failed: %d\n", (int) err); Limelog("Input: sendInputPacketOnControlStream() failed: %d\n", (int) err);
ListenerCallbacks.connectionTerminated(err); ListenerCallbacks.connectionTerminated(err);
@ -600,7 +600,7 @@ static void inputSendThreadProc(void* context) {
memcpy(splitPacket.packet.unicode.text, &holder->packet.unicode.text[i], codePointLength); memcpy(splitPacket.packet.unicode.text, &holder->packet.unicode.text[i], codePointLength);
// Encrypt and send the split packet // Encrypt and send the split packet
if (!sendInputPacket(&splitPacket)) { if (!sendInputPacket(&splitPacket, i + 1 < totalLength)) {
freePacketHolder(holder); freePacketHolder(holder);
return; return;
} }
@ -613,7 +613,7 @@ static void inputSendThreadProc(void* context) {
} }
// Encrypt and send the input packet // Encrypt and send the input packet
if (!sendInputPacket(holder)) { if (!sendInputPacket(holder, LbqGetItemCount(&packetQueue) > 0)) {
freePacketHolder(holder); freePacketHolder(holder);
return; return;
} }