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

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
commit d139c85d95
5 changed files with 51 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
limelight-common/ControlStream.c
View file

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