edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-14 03:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mac OS fix

Browse source
This commit is contained in:
Dennis Felsing 2018-12-17 15:07:09 +01:00
parent 1ca233988b
commit 9665dd67de
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/base/system.c
View file

@ -1582,13 +1582,13 @@ int net_udp_recv(NETSOCKET sock, NETADDR *addr, void *data, int maxsize, MMSGS*
#else #else
if(bytes == 0 && sock.ipv4sock >= 0) if(bytes == 0 && sock.ipv4sock >= 0)
{ {
int fromlen = sizeof(struct sockaddr_in); fromlen = sizeof(struct sockaddr_in);
bytes = recvfrom(sock.ipv4sock, (char*)data, maxsize, 0, (struct sockaddr *)&sockaddrbuf, &fromlen); bytes = recvfrom(sock.ipv4sock, (char*)data, maxsize, 0, (struct sockaddr *)&sockaddrbuf, &fromlen);
} }
if(bytes <= 0 && sock.ipv6sock >= 0) if(bytes <= 0 && sock.ipv6sock >= 0)
{ {
int fromlen = sizeof(struct sockaddr_in6); fromlen = sizeof(struct sockaddr_in6);
bytes = recvfrom(sock.ipv6sock, (char*)data, maxsize, 0, (struct sockaddr *)&sockaddrbuf, &fromlen); bytes = recvfrom(sock.ipv6sock, (char*)data, maxsize, 0, (struct sockaddr *)&sockaddrbuf, &fromlen);
} }
#endif #endif
@ -1596,7 +1596,7 @@ int net_udp_recv(NETSOCKET sock, NETADDR *addr, void *data, int maxsize, MMSGS*
#if defined(CONF_WEBSOCKETS) #if defined(CONF_WEBSOCKETS)
if(bytes <= 0 && sock.web_ipv4sock >= 0) if(bytes <= 0 && sock.web_ipv4sock >= 0)
{ {
int fromlen = sizeof(struct sockaddr); fromlen = sizeof(struct sockaddr);
bytes = websocket_recv(sock.web_ipv4sock, data, maxsize, (struct sockaddr_in *)&sockaddrbuf, fromlen); bytes = websocket_recv(sock.web_ipv4sock, data, maxsize, (struct sockaddr_in *)&sockaddrbuf, fromlen);
((struct sockaddr_in *)&sockaddrbuf)->sin_family = AF_WEBSOCKET_INET; ((struct sockaddr_in *)&sockaddrbuf)->sin_family = AF_WEBSOCKET_INET;
} }