fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This just feels safer...

This commit is contained in:
Shpoike 2023-07-25 14:24:29 +01:00
parent 4f38ff97c2
commit b5deda6b75
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Quake/net_dgrm.c
View File

@ -1490,7 +1490,7 @@ static void _Datagram_ServerControlPacket (sys_socket_t acceptsock, struct qsock
// check for a ban // check for a ban
//fixme: no ipv6 //fixme: no ipv6
//fixme: only a single address? someone seriously underestimates tor. //fixme: only a single address? someone seriously underestimates tor.
if (clientaddr->qsa_family == AF_INET) if (((struct sockaddr*)clientaddr)->sa_family == AF_INET)
{ {
in_addr_t testAddr; in_addr_t testAddr;
testAddr = ((struct sockaddr_in *)clientaddr)->sin_addr.s_addr; testAddr = ((struct sockaddr_in *)clientaddr)->sin_addr.s_addr;
@ -1801,7 +1801,7 @@ static qboolean _Datagram_SearchForHosts (qboolean xmit)
break; break;
if (*com_token) if (*com_token)
{ {
if (masteraddr.qsa_family == AF_INET6) if (((struct sockaddr*)&masteraddr)->sa_family == AF_INET6)
str = va("%c%c%c%cgetserversExt %s %u empty full ipv6"/*\x0A\n"*/, 255, 255, 255, 255, com_token, NET_PROTOCOL_VERSION); str = va("%c%c%c%cgetserversExt %s %u empty full ipv6"/*\x0A\n"*/, 255, 255, 255, 255, com_token, NET_PROTOCOL_VERSION);
else else
str = va("%c%c%c%cgetservers %s %u empty full"/*\x0A\n"*/, 255, 255, 255, 255, com_token, NET_PROTOCOL_VERSION); str = va("%c%c%c%cgetservers %s %u empty full"/*\x0A\n"*/, 255, 255, 255, 255, com_token, NET_PROTOCOL_VERSION);
@ -1846,7 +1846,7 @@ static qboolean _Datagram_SearchForHosts (qboolean xmit)
{ {
case '\\': case '\\':
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(addr));
addr.qsa_family = AF_INET; ((struct sockaddr_in*)&addr)->sin_family = AF_INET;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
((byte*)&((struct sockaddr_in*)&addr)->sin_addr)[i] = MSG_ReadByte(); ((byte*)&((struct sockaddr_in*)&addr)->sin_addr)[i] = MSG_ReadByte();
((byte*)&((struct sockaddr_in*)&addr)->sin_port)[0] = MSG_ReadByte(); ((byte*)&((struct sockaddr_in*)&addr)->sin_port)[0] = MSG_ReadByte();
@ -1856,7 +1856,7 @@ static qboolean _Datagram_SearchForHosts (qboolean xmit)
break; break;
case '/': case '/':
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(addr));
addr.qsa_family = AF_INET6; ((struct sockaddr_in6*)&addr)->sin6_family = AF_INET6;
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
((byte*)&((struct sockaddr_in6*)&addr)->sin6_addr)[i] = MSG_ReadByte(); ((byte*)&((struct sockaddr_in6*)&addr)->sin6_addr)[i] = MSG_ReadByte();
((byte*)&((struct sockaddr_in6*)&addr)->sin6_port)[0] = MSG_ReadByte(); ((byte*)&((struct sockaddr_in6*)&addr)->sin6_port)[0] = MSG_ReadByte();