mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Netplay) Do not try to receive new data if the buffer is full (#14343)

Browse Source
This commit is contained in:
Cthulhu-throwaway 2022-08-23 22:32:09 -03:00 committed by GitHub
parent fc861c167c
commit 620e048c52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
network/netplay/netplay_frontend.c
View File

@ -99,7 +99,7 @@
#endif #endif
#define RECV(buf, sz) \ #define RECV(buf, sz) \
recvd = netplay_recv(&connection->recv_packet_buffer, connection->fd, (buf), (sz), false); \ recvd = netplay_recv(&connection->recv_packet_buffer, connection->fd, (buf), (sz)); \
if (recvd >= 0) \ if (recvd >= 0) \
{ \ { \
if (recvd < (ssize_t) (sz)) \ if (recvd < (ssize_t) (sz)) \
@ -1838,7 +1838,7 @@ static bool netplay_handshake_pre_sync(netplay_t *netplay,
/* We cannot use the RECV macro here as we need to ALWAYS free sram_buf. */ /* We cannot use the RECV macro here as we need to ALWAYS free sram_buf. */
recvd = netplay_recv(&connection->recv_packet_buffer, connection->fd, recvd = netplay_recv(&connection->recv_packet_buffer, connection->fd,
sram_buf, remote_sram_size, false); sram_buf, remote_sram_size);
if (recvd < 0) if (recvd < 0)
{ {
free(sram_buf); free(sram_buf);
@ -2362,14 +2362,17 @@ bool netplay_send_flush(struct socket_buffer *sbuf, int sockfd, bool block)
* *
* Receive buffered or fresh data. * Receive buffered or fresh data.
* *
* Returns number of bytes returned, which may be short or 0, or -1 on error. * Returns number of bytes returned, which may be short, 0, or -1 on error.
*/ */
ssize_t netplay_recv(struct socket_buffer *sbuf, int sockfd, void *buf, ssize_t netplay_recv(struct socket_buffer *sbuf, int sockfd,
size_t len, bool block) void *buf, size_t len)
{ {
ssize_t recvd; ssize_t recvd;
bool error = false; bool error = false;
if (buf_used(sbuf) >= (sbuf->bufsz - 1))
return 0;
/* Receive whatever we can into the buffer */ /* Receive whatever we can into the buffer */
if (sbuf->end >= sbuf->start) if (sbuf->end >= sbuf->start)
{ {
@ -2385,14 +2388,18 @@ ssize_t netplay_recv(struct socket_buffer *sbuf, int sockfd, void *buf,
if (sbuf->end >= sbuf->bufsz) if (sbuf->end >= sbuf->bufsz)
{ {
sbuf->end = 0; sbuf->end = 0;
error = false;
recvd = socket_receive_all_nonblocking(
sockfd, &error, sbuf->data, sbuf->start - 1);
if (recvd < 0 || error) if (sbuf->start > 1)
return -1; {
error = false;
recvd = socket_receive_all_nonblocking(sockfd, &error,
sbuf->data, sbuf->start - 1);
sbuf->end += recvd; if (recvd < 0 || error)
return -1;
sbuf->end += recvd;
}
} }
} }
else else
@ -2411,6 +2418,7 @@ ssize_t netplay_recv(struct socket_buffer *sbuf, int sockfd, void *buf,
if (sbuf->end >= sbuf->read || (sbuf->bufsz - sbuf->read) >= len) if (sbuf->end >= sbuf->read || (sbuf->bufsz - sbuf->read) >= len)
{ {
size_t unread = buf_unread(sbuf); size_t unread = buf_unread(sbuf);
if (len <= unread) if (len <= unread)
{ {
memcpy(buf, sbuf->data + sbuf->read, len); memcpy(buf, sbuf->data + sbuf->read, len);
@ -2420,7 +2428,7 @@ ssize_t netplay_recv(struct socket_buffer *sbuf, int sockfd, void *buf,
recvd = len; recvd = len;
} }
else else if (unread > 0)
{ {
memcpy(buf, sbuf->data + sbuf->read, unread); memcpy(buf, sbuf->data + sbuf->read, unread);
sbuf->read += unread; sbuf->read += unread;
@ -2428,32 +2436,24 @@ ssize_t netplay_recv(struct socket_buffer *sbuf, int sockfd, void *buf,
sbuf->read = 0; sbuf->read = 0;
recvd = unread; recvd = unread;
} }
else
recvd = 0;
} }
else else
{ {
/* Our read goes around the edge */ /* Our read goes around the edge */
size_t chunka = sbuf->bufsz - sbuf->read, size_t chunka = sbuf->bufsz - sbuf->read;
pchunklen = len - chunka, size_t chunkb = ((len - chunka) > sbuf->end) ? sbuf->end :
chunkb = (pchunklen >= sbuf->end) ? sbuf->end : pchunklen; (len - chunka);
memcpy(buf, sbuf->data + sbuf->read, chunka); memcpy(buf, sbuf->data + sbuf->read, chunka);
memcpy((unsigned char *) buf + chunka, sbuf->data, chunkb); if (chunkb > 0)
memcpy((unsigned char*)buf + chunka, sbuf->data, chunkb);
sbuf->read = chunkb; sbuf->read = chunkb;
recvd = chunka + chunkb; recvd = chunka + chunkb;
} }
/* Perhaps block for more data */
if (block)
{
sbuf->start = sbuf->read;
if (recvd < 0 || recvd < (ssize_t) len)
{
if (!socket_receive_all_blocking(
sockfd, (unsigned char *)buf + recvd, len - recvd))
return -1;
recvd = len;
}
}
return recvd; return recvd;
} }
@ -5157,7 +5157,7 @@ static void answer_ping(netplay_t *netplay,
#undef RECV #undef RECV
#define RECV(buf, sz) \ #define RECV(buf, sz) \
recvd = netplay_recv(&connection->recv_packet_buffer, connection->fd, (buf), (sz), false); \ recvd = netplay_recv(&connection->recv_packet_buffer, connection->fd, (buf), (sz)); \
if (recvd >= 0) \ if (recvd >= 0) \
{ \ { \
if (recvd < (ssize_t) (sz)) \ if (recvd < (ssize_t) (sz)) \

8
network/netplay/netplay_private.h
View File

@ -696,12 +696,10 @@ bool netplay_send_flush(struct socket_buffer *sbuf,
* *
* Receive buffered or fresh data. * Receive buffered or fresh data.
* *
* Returns number of bytes returned, which may be * Returns number of bytes returned, which may be short, 0, or -1 on error.
* short or 0, or -1 on error.
*/ */
ssize_t netplay_recv(struct socket_buffer *sbuf, ssize_t netplay_recv(struct socket_buffer *sbuf, int sockfd,
int sockfd, void *buf, void *buf, size_t len);
size_t len, bool block);
/** /**
* netplay_recv_reset * netplay_recv_reset