diff options
author | Trond Abusdal <trond.abusdal@gmail.com> | 2015-11-19 19:06:01 +0100 |
---|---|---|
committer | Trond Abusdal <trond.abusdal@gmail.com> | 2015-11-19 19:06:01 +0100 |
commit | a8a2458f0b490ee323632c95543106232efd8042 (patch) | |
tree | 762b071a71843b074292402e08171305e78c2e3d /drivers/unix | |
parent | 41a161647dd8f3f0bfa5727ee1b357ea8605c348 (diff) |
Fixed mistake where available buffer size would not be updated for each recvfrom-call in PacketPeerUDPWinsockPposix.
Diffstat (limited to 'drivers/unix')
-rw-r--r-- | drivers/unix/packet_peer_udp_posix.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/unix/packet_peer_udp_posix.cpp b/drivers/unix/packet_peer_udp_posix.cpp index 8e28dd5bca..2111619080 100644 --- a/drivers/unix/packet_peer_udp_posix.cpp +++ b/drivers/unix/packet_peer_udp_posix.cpp @@ -120,10 +120,8 @@ Error PacketPeerUDPPosix::_poll(bool p_wait) { struct sockaddr_in from = {0}; socklen_t len = sizeof(struct sockaddr_in); - int rb_size = MAX(rb.space_left()-12, 0); - int buffer_size = MIN((int)sizeof(recv_buffer),rb_size); int ret; - while ( (ret = recvfrom(sockfd, recv_buffer, buffer_size, p_wait?0:MSG_DONTWAIT, (struct sockaddr*)&from, &len)) > 0) { + while ( (ret = recvfrom(sockfd, recv_buffer, MIN((int)sizeof(recv_buffer),MAX(rb.space_left()-12, 0)), p_wait?0:MSG_DONTWAIT, (struct sockaddr*)&from, &len)) > 0) { rb.write((uint8_t*)&from.sin_addr, 4); uint32_t port = ntohs(from.sin_port); rb.write((uint8_t*)&port, 4); |