From 93286836f944cf71c0f344eab8c1b0a29666f82a Mon Sep 17 00:00:00 2001
From: Deomid Ryabkov <rojer@cesanta.com>
Date: Fri, 2 Nov 2018 14:32:29 +0000
Subject: [PATCH] Read all available data during recv poll
CL: mg: Read all available data during recv poll
PUBLISHED_FROM=b081025b9fb392c988924c7097b5333c38053f6f
---
mongoose.c | 26 ++++++++++++++------------
src/mg_net.c | 26 ++++++++++++++------------
2 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/mongoose.c b/mongoose.c
index 7c4e691de..75332c618 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -2882,18 +2882,20 @@ static int mg_do_recv(struct mg_connection *nc) {
((nc->flags & MG_F_LISTENING) && !(nc->flags & MG_F_UDP))) {
return -1;
}
- len = recv_avail_size(nc, len);
- if (len == 0) return -2;
- if (nc->recv_mbuf.size < nc->recv_mbuf.len + len) {
- mbuf_resize(&nc->recv_mbuf, nc->recv_mbuf.len + len);
- }
- buf = nc->recv_mbuf.buf + nc->recv_mbuf.len;
- len = nc->recv_mbuf.size - nc->recv_mbuf.len;
- if (nc->flags & MG_F_UDP) {
- res = mg_recv_udp(nc, buf, len);
- } else {
- res = mg_recv_tcp(nc, buf, len);
- }
+ do {
+ len = recv_avail_size(nc, len);
+ if (len == 0) return -2;
+ if (nc->recv_mbuf.size < nc->recv_mbuf.len + len) {
+ mbuf_resize(&nc->recv_mbuf, nc->recv_mbuf.len + len);
+ }
+ buf = nc->recv_mbuf.buf + nc->recv_mbuf.len;
+ len = nc->recv_mbuf.size - nc->recv_mbuf.len;
+ if (nc->flags & MG_F_UDP) {
+ res = mg_recv_udp(nc, buf, len);
+ } else {
+ res = mg_recv_tcp(nc, buf, len);
+ }
+ } while (res > 0);
return res;
}
diff --git a/src/mg_net.c b/src/mg_net.c
index 97afe9ab5..809895c61 100644
--- a/src/mg_net.c
+++ b/src/mg_net.c
@@ -565,18 +565,20 @@ static int mg_do_recv(struct mg_connection *nc) {
((nc->flags & MG_F_LISTENING) && !(nc->flags & MG_F_UDP))) {
return -1;
}
- len = recv_avail_size(nc, len);
- if (len == 0) return -2;
- if (nc->recv_mbuf.size < nc->recv_mbuf.len + len) {
- mbuf_resize(&nc->recv_mbuf, nc->recv_mbuf.len + len);
- }
- buf = nc->recv_mbuf.buf + nc->recv_mbuf.len;
- len = nc->recv_mbuf.size - nc->recv_mbuf.len;
- if (nc->flags & MG_F_UDP) {
- res = mg_recv_udp(nc, buf, len);
- } else {
- res = mg_recv_tcp(nc, buf, len);
- }
+ do {
+ len = recv_avail_size(nc, len);
+ if (len == 0) return -2;
+ if (nc->recv_mbuf.size < nc->recv_mbuf.len + len) {
+ mbuf_resize(&nc->recv_mbuf, nc->recv_mbuf.len + len);
+ }
+ buf = nc->recv_mbuf.buf + nc->recv_mbuf.len;
+ len = nc->recv_mbuf.size - nc->recv_mbuf.len;
+ if (nc->flags & MG_F_UDP) {
+ res = mg_recv_udp(nc, buf, len);
+ } else {
+ res = mg_recv_tcp(nc, buf, len);
+ }
+ } while (res > 0);
return res;
}
--
GitLab