moonlight-stream/moonlight-common-c
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-common-c.git synced 2025-08-17 17:05:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix UDP thread terminations

Browse Source
This commit is contained in:
Cameron Gutman 2016-02-15 18:46:14 -05:00
parent ceb9504ade
commit 5de8f4c98c
4 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
limelight-common/AudioStream.c
View File

@ -161,12 +161,16 @@ static void ReceiveThreadProc(void* context) {
}
}
packet->size = (int)recv(rtpSocket, &packet->data[0], MAX_PACKET_SIZE, 0);
if (packet->size <= 0) {
Limelog("Audio Receive: recv() failed: %d\n", (int)LastSocketError());
packet->size = recvUdpSocket(rtpSocket, &packet->data[0], MAX_PACKET_SIZE);
if (packet->size < 0) {
Limelog("Audio Receive: recvUdpSocket() failed: %d\n", (int)LastSocketError());
ListenerCallbacks.connectionTerminated(LastSocketError());
break;
}
else if (packet->size == 0) {
// Receive timed out; try again
continue;
}
if (packet->size < sizeof(RTP_PACKET)) {
// Runt packet
@ -252,11 +256,7 @@ void stopAudioStream(void) {
LbqSignalQueueShutdown(&packetQueue);
PltInterruptThread(&decoderThread);
}
if (rtpSocket != INVALID_SOCKET) {
shutdownUdpSocket(rtpSocket);
}
PltJoinThread(&udpPingThread);
PltJoinThread(&receiveThread);
if ((AudioCallbacks.capabilities & CAPABILITY_DIRECT_SUBMIT) == 0) {

31
limelight-common/PlatformSockets.c
View File

@ -27,23 +27,26 @@ void shutdownTcpSocket(SOCKET s) {
shutdown(s, SHUT_RDWR);
}
void shutdownUdpSocket(SOCKET s) {
SOCKADDR_LEN len;
struct sockaddr_storage addr;
unsigned char buf[1];
int recvUdpSocket(SOCKET s, char* buffer, int size) {
fd_set readfds;
int err;
struct timeval tv;
// UDP sockets can't be shutdown(), so we'll indicate
// termination by sending a 0 byte packet to ourselves
if (getsockname(s, (struct sockaddr*)&addr, &len) < 0) {
Limelog("getsockname() failed: %d\n", (int)LastSocketError());
return;
FD_ZERO(&readfds);
FD_SET(s, &readfds);
// Wait up to 500 ms for the socket to be readable
tv.tv_sec = 0;
tv.tv_usec = 500 * 1000;
err = select((int)(s) + 1, &readfds, NULL, NULL, &tv);
if (err <= 0) {
// Return if an error or timeout occurs
return err;
}
if (sendto(s, buf, 0, 0, (struct sockaddr*)&addr, len) < 0) {
Limelog("sendto() failed: %d\n", (int)LastSocketError());
return;
}
// This won't block since the socket is readable
return (int)recv(s, buffer, size, 0);
}
void closeSocket(SOCKET s) {

3
limelight-common/PlatformSockets.h
View File

@ -17,6 +17,7 @@ typedef int SOCKADDR_LEN;
#else
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/select.h>
#include <netinet/tcp.h>
#include <netinet/in.h>
#include <arpa/inet.h>
@ -43,6 +44,6 @@ void addrToUrlSafeString(struct sockaddr_storage* addr, char* string);
SOCKET connectTcpSocket(struct sockaddr_storage* dstaddr, SOCKADDR_LEN addrlen, unsigned short port);
SOCKET bindUdpSocket(int addrfamily, int bufferSize);
int enableNoDelay(SOCKET s);
void shutdownUdpSocket(SOCKET s);
int recvUdpSocket(SOCKET s, char* buffer, int size);
void shutdownTcpSocket(SOCKET s);
void closeSocket(SOCKET s);

13
limelight-common/VideoStream.c
View File

@ -80,12 +80,16 @@ static void ReceiveThreadProc(void* context) {
}
}
err = (int)recv(rtpSocket, buffer, receiveSize, 0);
if (err <= 0) {
Limelog("Video Receive: recv() failed: %d\n", (int)LastSocketError());
err = recvUdpSocket(rtpSocket, buffer, receiveSize);
if (err < 0) {
Limelog("Video Receive: recvUdpSocket() failed: %d\n", (int)LastSocketError());
ListenerCallbacks.connectionTerminated(LastSocketError());
break;
}
else if (err == 0) {
// Receive timed out; try again
continue;
}
memcpy(&buffer[receiveSize], &err, sizeof(int));
@ -161,9 +165,6 @@ void stopVideoStream(void) {
if (firstFrameSocket != INVALID_SOCKET) {
shutdownTcpSocket(firstFrameSocket);
}
if (rtpSocket != INVALID_SOCKET) {
shutdownUdpSocket(rtpSocket);
}
PltJoinThread(&udpPingThread);
PltJoinThread(&receiveThread);