libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #613 from aozima/pulls 

fixed Lwip bug: Assert on TCP netconn_write with sndtimeout set
This commit is contained in:
Bernard Xiong 2016-03-03 09:30:40 +08:00
parent 24d089d80a 8131ea9c30
commit 10fd3d34ad
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/net/lwip-1.4.1/src/api/api_msg.c
View File

@ -1235,6 +1235,7 @@ do_writemore(struct netconn *conn)
/* partial write */ /* partial write */
err = ERR_OK; err = ERR_OK;
conn->current_msg->msg.w.len = conn->write_offset; conn->current_msg->msg.w.len = conn->write_offset;
conn->write_offset = 0;
} }
} else } else
#endif /* LWIP_SO_SNDTIMEO */ #endif /* LWIP_SO_SNDTIMEO */

1
components/net/lwip-head/src/api/api_msg.c
View File

@ -1261,6 +1261,7 @@ lwip_netconn_do_writemore(struct netconn *conn)
/* partial write */ /* partial write */
err = ERR_OK; err = ERR_OK;
conn->current_msg->msg.w.len = conn->write_offset; conn->current_msg->msg.w.len = conn->write_offset;
conn->write_offset = 0;
} }
} else } else
#endif /* LWIP_SO_SNDTIMEO */ #endif /* LWIP_SO_SNDTIMEO */