moonlight-stream/moonlight-common-c
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-common-c.git synced 2026-06-16 22:00:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use RAND_bytes() instead of rand() for STUN transaction IDs

Browse Source
This commit is contained in:
Cameron Gutman
2019-12-08 14:49:28 -08:00
parent f5ae5df5d0
commit 3dd9a9f1b1
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SimpleStun.c
+4 -5
View File
@@ -1,5 +1,7 @@
#include "Limelight-internal.h" #include "Limelight-internal.h"
#include <openssl/rand.h>
#define STUN_RECV_TIMEOUT_SEC 3 #define STUN_RECV_TIMEOUT_SEC 3
#define STUN_MESSAGE_BINDING_REQUEST 0x0001 #define STUN_MESSAGE_BINDING_REQUEST 0x0001
@@ -24,12 +26,11 @@ typedef struct _STUN_MAPPED_IPV4_ADDRESS_ATTRIBUTE {
unsigned int address; unsigned int address;
} STUN_MAPPED_IPV4_ADDRESS_ATTRIBUTE, *PSTUN_MAPPED_IPV4_ADDRESS_ATTRIBUTE; } STUN_MAPPED_IPV4_ADDRESS_ATTRIBUTE, *PSTUN_MAPPED_IPV4_ADDRESS_ATTRIBUTE;
#define TXID_DWORDS 3
typedef struct _STUN_MESSAGE { typedef struct _STUN_MESSAGE {
unsigned short messageType; unsigned short messageType;
unsigned short messageLength; unsigned short messageLength;
unsigned int magicCookie; unsigned int magicCookie;
int transactionId[TXID_DWORDS]; unsigned char transactionId[12];
} STUN_MESSAGE, *PSTUN_MESSAGE; } STUN_MESSAGE, *PSTUN_MESSAGE;
#pragma pack(pop) #pragma pack(pop)
@@ -82,9 +83,7 @@ int LiFindExternalAddressIP4(const char* stunServer, unsigned short stunPort, un
reqMsg.messageType = htons(STUN_MESSAGE_BINDING_REQUEST); reqMsg.messageType = htons(STUN_MESSAGE_BINDING_REQUEST);
reqMsg.messageLength = 0; reqMsg.messageLength = 0;
reqMsg.magicCookie = htonl(STUN_MESSAGE_COOKIE); reqMsg.magicCookie = htonl(STUN_MESSAGE_COOKIE);
for (i = 0; i < TXID_DWORDS; i++) { RAND_bytes(reqMsg.transactionId, sizeof(reqMsg.transactionId));
reqMsg.transactionId[i] = rand();
}
bytesRead = SOCKET_ERROR; bytesRead = SOCKET_ERROR;
for (i = 0; i < STUN_RECV_TIMEOUT_SEC * 1000 / UDP_RECV_POLL_TIMEOUT_MS && bytesRead <= 0; i++) { for (i = 0; i < STUN_RECV_TIMEOUT_SEC * 1000 / UDP_RECV_POLL_TIMEOUT_MS && bytesRead <= 0; i++) {