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

Conflicts:
	limelight-common/InputStream.c

limelight-common/ControlStream.c

@@ -96,7 +96,7 @@ static PNVCTL_PACKET_HEADER readNvctlPacket(void) {
 
 	memcpy(fullPacket, &staticHeader, sizeof(staticHeader));
 	if (staticHeader.payloadLength != 0) {
-	err = recv(ctlSock, (char*) (fullPacket + 1), staticHeader.payloadLength, 0);
+		err = recv(ctlSock, (char*) (fullPacket + 1), staticHeader.payloadLength, 0);
 		if (err != staticHeader.payloadLength) {
 			free(fullPacket);
 			return NULL;
@@ -107,21 +107,23 @@ static PNVCTL_PACKET_HEADER readNvctlPacket(void) {
 }
 
 static int sendMessageAndForget(short ptype, short paylen, const void* payload) {
-	NVCTL_PACKET_HEADER header;
+	PNVCTL_PACKET_HEADER packet;
 	SOCK_RET err;
 
-	header.type = ptype;
-	header.payloadLength = paylen;
-	err = send(ctlSock, (char*) &header, sizeof(header), 0);
-	if (err != sizeof(header)) {
+	packet = malloc(sizeof(*packet) + paylen);
+	if (packet == NULL) {
 		return 0;
 	}
 
-	if (payload != NULL) {
-		err = send(ctlSock, payload, paylen, 0);
-		if (err != paylen) {
-			return 0;
-		}
+	packet->type = ptype;
+	packet->payloadLength = paylen;
+	memcpy(&packet[1], payload, paylen);
+
+	err = send(ctlSock, (char*) packet, sizeof(*packet) + paylen, 0);
+	free(packet);
+
+	if (err != sizeof(*packet)) {
+		return 0;
 	}
 
 	return 1;

limelight-common/InputStream.c

@@ -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;
 		}

limelight-common/Platform.h

@@ -21,6 +21,9 @@
 # endif
 #else
 # define LC_POSIX
+# if defined(__APPLE__)
+#  define LC_DARWIN
+# endif
 #endif
 
 #include <stdio.h>

limelight-common/PlatformSockets.c

@@ -20,7 +20,14 @@ SOCKET bindUdpSocket(void) {
 		SetLastSocketError(err);
 		return INVALID_SOCKET;
 	}
+    
+#ifdef LC_DARWIN
+    // Disable SIGPIPE on iOS
+    val = 1;
+    setsockopt(s, SOL_SOCKET, SO_NOSIGPIPE, (char* )&val, sizeof(val));
+#endif
 
+    // Set the receive buffer to 64KB by default
 	val = 65536;
 	setsockopt(s, SOL_SOCKET, SO_RCVBUF, (char*) &val, sizeof(val));
 
@@ -31,11 +38,20 @@ SOCKET connectTcpSocket(IP_ADDRESS dstaddr, unsigned short port) {
 	SOCKET s;
 	struct sockaddr_in addr;
 	int err;
+#ifdef LC_DARWIN
+    int val;
+#endif
 
 	s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 	if (s == INVALID_SOCKET) {
 		return INVALID_SOCKET;
 	}
+    
+#ifdef LC_DARWIN
+    // Disable SIGPIPE on iOS
+    val = 1;
+    setsockopt(s, SOL_SOCKET, SO_NOSIGPIPE, (char* )&val, sizeof(val));
+#endif
 
 	memset(&addr, 0, sizeof(addr));
 	addr.sin_family = AF_INET;