mirror of
https://github.com/cesanta/mongoose.git
synced 2026-11-21 19:51:50 +00:00
Fix TCP RX path regression in SSL mode
CL: Fix TCP RX path regression in SSL mode PUBLISHED_FROM=2cfdb33e5f711bbc4b98e2d24ba3377de0f1d3c5
This commit is contained in:
1 parent
ac538f755f
commit
d6475fcd19
1 file changed
+11
-11
+11
-11
@@ -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) {
|
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;
|
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();
|
mgos_lock();
|
||||||
while (cs->rx_chain != NULL && nc->recv_mbuf.len < nc->recv_mbuf_limit) {
|
while (cs->rx_chain != NULL && nc->recv_mbuf.len < nc->recv_mbuf_limit) {
|
||||||
struct pbuf *seg = cs->rx_chain;
|
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) {
|
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);
|
mg_lwip_consume_rx_chain_tcp(nc);
|
||||||
|
|
||||||
if (nc->send_mbuf.len > 0) {
|
if (nc->send_mbuf.len > 0) {
|
||||||
|
|||||||
Reference in new issue
Block a user