moonlight-stream/moonlight-common-c
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-common-c.git synced 2026-04-21 07:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/limelight-stream/limelight-common-c

Browse Source 
Conflicts:
	limelight-common/InputStream.c
This commit is contained in:
Michelle Bergeron
2014-10-23 01:20:43 -04:00
parent d9f55e9c8f 47820c35bd
commit d139c85d95
5 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
limelight-common/InputStream.c
View File

@@ -90,6 +90,8 @@ void destroyInputStream(void) {
initialized = 0;
}
#define OAES_DATA_OFFSET 32
/* Input thread proc */
static void inputSendThreadProc(void* context) {
SOCK_RET err;
@@ -118,21 +120,20 @@ static void inputSendThreadProc(void* context) {
}
// The first 32-bytes of the output are internal OAES stuff that we want to ignore
encryptedSize -= 32;
encryptedSize -= OAES_DATA_OFFSET;
// Send the encrypted length first
// Overwrite the last 4 bytes before the encrypted data with the length so
// we can send the message all at once. GFE can choke if it gets the header
// before the rest of the message.
encryptedLengthPrefix = htonl((unsigned long) encryptedSize);
err = send(inputSock, (const char*) &encryptedLengthPrefix, sizeof(encryptedLengthPrefix), 0);
if (err <= 0) {
Limelog("Input thread terminating #3\n");
listenerCallbacks->connectionTerminated(err);
return;
}
memcpy(&encryptedBuffer[OAES_DATA_OFFSET - sizeof(encryptedLengthPrefix)],
&encryptedLengthPrefix, sizeof(encryptedLengthPrefix));
// Send the encrypted payload
err = send(inputSock, (const char*) &encryptedBuffer[32], encryptedSize, 0);
err = send(inputSock, (const char*) &encryptedBuffer[OAES_DATA_OFFSET - sizeof(encryptedLengthPrefix)],
encryptedSize + sizeof(encryptedLengthPrefix), 0);
if (err <= 0) {
Limelog("Input thread terminating #4\n");
Limelog("Input thread terminating #3\n");
listenerCallbacks->connectionTerminated(err);
return;
}