CrunkLord420/Shrine
1
0
Fork 0
mirror of https://github.com/minexew/Shrine.git synced 2026-05-26 05:48:36 +00:00
Code Issues Projects Releases Wiki Activity

TcpSocketSendto: do not block after some data has been sent

Browse Source
This commit is contained in:
minexew
2020-11-13 12:07:06 +01:00
parent 72c84e3379
commit e64edad835
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Adam/Net/Tcp.HC
+18 -3
View File
@@ -681,6 +681,8 @@ I64 TcpSocketRecvfrom(CTcpSocket* s, U8* buf, I64 len, I64 flags, sockaddr* src_
return read_total;
}
// This function blocks until at least some data is sent.
// Then it returns if the transmission window or outgoing buffers are full.
I64 TcpSocketSendto(CTcpSocket* s, U8* buf, I64 len, I64 flags, sockaddr_in* dest_addr, I64 addrlen) {
no_warn dest_addr; // TODO: should be validated instead, no?
no_warn addrlen;
@@ -700,6 +702,7 @@ I64 TcpSocketSendto(CTcpSocket* s, U8* buf, I64 len, I64 flags, sockaddr_in* des
if (sent_total > 0)
break;
else {
// Check unacknowledged outgoing packets, re-transmit as needed
TcpSocketCheckSendBufs(s);
Yield;
}
@@ -711,9 +714,21 @@ I64 TcpSocketSendto(CTcpSocket* s, U8* buf, I64 len, I64 flags, sockaddr_in* des
if (can_send > s->mss)
can_send = s->mss;
TcpSendData2(s, TCP_FLAG_ACK, buf, can_send);
buf += can_send;
len -= can_send;
if (TcpSendData2(s, TCP_FLAG_ACK, buf, can_send) < 0) {
// No out-buffers available! Handle in the same way as full window:
// stall until some of the outdoing data is acknowledged.
if (sent_total > 0)
break;
else {
// Check unacknowledged outgoing packets, re-transmit as needed
TcpSocketCheckSendBufs(s);
Yield;
}
}
else {
buf += can_send;
len -= can_send;
}
}
}