mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-01-30 21:32:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed that SHUT_RD followed by SHUT_WR was different to SHUT_RDWR, fixed return value of lwip_netconn_do_close on unconnected netconns

Browse Source
This commit is contained in:
sg 2015-01-27 21:28:39 +01:00
parent 24df78bcbc
commit ec68aaf43b
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -156,6 +156,10 @@ HISTORY
++ Bugfixes: ++ Bugfixes:
2014-01-27: Simon Goldschmidt
* api_msg.c: fixed that SHUT_RD followed by SHUT_WR was different to SHUT_RDWR,
fixed return value of lwip_netconn_do_close on unconnected netconns
2015-01-17: Simon Goldschmidt 2015-01-17: Simon Goldschmidt
* sockets.c: fixed bug #43361 select() crashes with stale FDs * sockets.c: fixed bug #43361 select() crashes with stale FDs

39
src/api/api_msg.c
View File

@ -757,6 +757,7 @@ lwip_netconn_do_close_internal(struct netconn *conn)
{ {
err_t err; err_t err;
u8_t shut, shut_rx, shut_tx, close; u8_t shut, shut_rx, shut_tx, close;
struct tcp_pcb* tpcb = conn->pcb.tcp;
LWIP_ASSERT("invalid conn", (conn != NULL)); LWIP_ASSERT("invalid conn", (conn != NULL));
LWIP_ASSERT("this is for tcp netconns only", (NETCONNTYPE_GROUP(conn->type) == NETCONN_TCP)); LWIP_ASSERT("this is for tcp netconns only", (NETCONNTYPE_GROUP(conn->type) == NETCONN_TCP));
@ -767,34 +768,46 @@ lwip_netconn_do_close_internal(struct netconn *conn)
shut = conn->current_msg->msg.sd.shut; shut = conn->current_msg->msg.sd.shut;
shut_rx = shut & NETCONN_SHUT_RD; shut_rx = shut & NETCONN_SHUT_RD;
shut_tx = shut & NETCONN_SHUT_WR; shut_tx = shut & NETCONN_SHUT_WR;
/* shutting down both ends is the same as closing */ /* shutting down both ends is the same as closing
close = shut == NETCONN_SHUT_RDWR; (also if RD or WR side was shut down before already) */
if (shut == NETCONN_SHUT_RDWR) {
close = 1;
} else if (shut_rx &&
((tpcb->state == FIN_WAIT_1) ||
(tpcb->state == FIN_WAIT_2) ||
(tpcb->state == CLOSING))) {
close = 1;
} else if (shut_tx && ((tpcb->flags & TF_RXCLOSED) != 0)) {
close = 1;
} else {
close = 0;
}
/* Set back some callback pointers */ /* Set back some callback pointers */
if (close) { if (close) {
tcp_arg(conn->pcb.tcp, NULL); tcp_arg(tpcb, NULL);
} }
if (conn->pcb.tcp->state == LISTEN) { if (tpcb->state == LISTEN) {
tcp_accept(conn->pcb.tcp, NULL); tcp_accept(tpcb, NULL);
} else { } else {
/* some callbacks have to be reset if tcp_close is not successful */ /* some callbacks have to be reset if tcp_close is not successful */
if (shut_rx) { if (shut_rx) {
tcp_recv(conn->pcb.tcp, NULL); tcp_recv(tpcb, NULL);
tcp_accept(conn->pcb.tcp, NULL); tcp_accept(tpcb, NULL);
} }
if (shut_tx) { if (shut_tx) {
tcp_sent(conn->pcb.tcp, NULL); tcp_sent(tpcb, NULL);
} }
if (close) { if (close) {
tcp_poll(conn->pcb.tcp, NULL, 4); tcp_poll(tpcb, NULL, 4);
tcp_err(conn->pcb.tcp, NULL); tcp_err(tpcb, NULL);
} }
} }
/* Try to close the connection */ /* Try to close the connection */
if (close) { if (close) {
err = tcp_close(conn->pcb.tcp); err = tcp_close(tpcb);
} else { } else {
err = tcp_shutdown(conn->pcb.tcp, shut_rx, shut_tx); err = tcp_shutdown(tpcb, shut_rx, shut_tx);
} }
if (err == ERR_OK) { if (err == ERR_OK) {
/* Closing succeeded */ /* Closing succeeded */
@ -1537,7 +1550,7 @@ lwip_netconn_do_close(struct api_msg_msg *msg)
} else } else
#endif /* LWIP_TCP */ #endif /* LWIP_TCP */
{ {
msg->err = ERR_VAL; msg->err = ERR_CONN;
} }
sys_sem_signal(LWIP_API_MSG_SEM(msg)); sys_sem_signal(LWIP_API_MSG_SEM(msg));
} }