From d6475fcd19e94e0f744709d8e0f76679a20f739f Mon Sep 17 00:00:00 2001
From: Deomid Ryabkov <rojer@cesanta.com>
Date: Thu, 18 Jan 2018 08:45:33 +0000
Subject: [PATCH] Fix TCP RX path regression in SSL mode
CL: Fix TCP RX path regression in SSL mode
PUBLISHED_FROM=2cfdb33e5f711bbc4b98e2d24ba3377de0f1d3c5
---
mongoose.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/mongoose.c b/mongoose.c
index 7f7aad35c..c9b4f0694 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -15025,6 +15025,17 @@ static err_t mg_lwip_tcp_recv_cb(void *arg, struct tcp_pcb *tpcb,
static void mg_lwip_consume_rx_chain_tcp(struct mg_connection *nc) {
struct mg_lwip_conn_state *cs = (struct mg_lwip_conn_state *) nc->sock;
+ if (cs->rx_chain == NULL) return;
+#if MG_ENABLE_SSL
+ if (nc->flags & MG_F_SSL) {
+ if (nc->flags & MG_F_SSL_HANDSHAKE_DONE) {
+ mg_lwip_ssl_recv(nc);
+ } else {
+ mg_lwip_ssl_do_hs(nc);
+ }
+ return;
+ }
+#endif
mgos_lock();
while (cs->rx_chain != NULL && nc->recv_mbuf.len < nc->recv_mbuf_limit) {
struct pbuf *seg = cs->rx_chain;
@@ -15054,17 +15065,6 @@ static void mg_lwip_consume_rx_chain_tcp(struct mg_connection *nc) {
}
static void mg_lwip_handle_recv_tcp(struct mg_connection *nc) {
-#if MG_ENABLE_SSL
- if (nc->flags & MG_F_SSL) {
- if (nc->flags & MG_F_SSL_HANDSHAKE_DONE) {
- mg_lwip_ssl_recv(nc);
- } else {
- mg_lwip_ssl_do_hs(nc);
- }
- return;
- }
-#endif
-
mg_lwip_consume_rx_chain_tcp(nc);
if (nc->send_mbuf.len > 0) {
--
GitLab