sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Yet another repair for the previouis botched recvfrom() fix; Fix telnet driver: It needs to break out of the read loop if 0 (meaning not conneced) of a value < 0 (an error) is encountered.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5541 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2013-01-20 00:41:33 +00:00
parent 00082e0da7
commit 5a7e3d551f
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -3993,3 +3993,6 @@
(gracefully). recv[from]() returned success and the closure (gracefully). recv[from]() returned success and the closure
was never detected. Hmmm.. I don't know why the network monitor was never detected. Hmmm.. I don't know why the network monitor
did not catch this event. This is an important bug fix. did not catch this event. This is an important bug fix.
* net/recvfrom(): Fix a introduced with the last bugfix. If
the peer does an orderly closure of the socket, report 0 not
-ENOTCONN

45
net/recvfrom.c
View File

@ -571,40 +571,47 @@ static uint16_t recvfrom_tcpinterrupt(struct uip_driver_s *dev, void *conn,
* gracefully disconnected * gracefully disconnected
* _SF_CONNECTED==0 && _SF_CLOSED==0 - the socket was * _SF_CONNECTED==0 && _SF_CLOSED==0 - the socket was
* rudely disconnected * rudely disconnected
*
* These flag settings are probably not necessary if
* CONFIG_NET_TCP_RECVDELAY == 0; in that case we know that
* pstate->rf_recvlen == 0 and we will always return -ENOTCONN.
*/ */
psock = pstate->rf_sock; psock = pstate->rf_sock;
if ((flags & UIP_CLOSE) != 0) if ((flags & UIP_CLOSE) != 0)
{ {
/* Report that the connection was gracefully closed */
psock->s_flags &= ~_SF_CONNECTED; psock->s_flags &= ~_SF_CONNECTED;
psock->s_flags |= _SF_CLOSED; psock->s_flags |= _SF_CLOSED;
}
else
{
psock->s_flags &= ~(_SF_CONNECTED |_SF_CLOSED);
}
/* If no data has been received, then return ENOTCONN. /* This case should always return success (zero)! The value of
* Otherwise, let this return success. The failure will * rf_recvlen, if zero, will indicate that the connection was
* be reported the next time that recv[from]() is called. * gracefully closed.
*/ */
#if CONFIG_NET_TCP_RECVDELAY > 0
if (pstate->rf_recvlen > 0)
{
pstate->rf_result = 0; pstate->rf_result = 0;
} }
else else
{ {
pstate->rf_result = -ENOTCONN; /* Report that the connection was rudely lost */
}
psock->s_flags &= ~(_SF_CONNECTED |_SF_CLOSED);
/* If no data has been received, then return ENOTCONN.
* Otherwise, let this return success. The failure will
* be reported the next time that recv[from]() is called.
*/
#if CONFIG_NET_TCP_RECVDELAY > 0
if (pstate->rf_recvlen > 0)
{
pstate->rf_result = 0;
}
else
{
pstate->rf_result = -ENOTCONN;
}
#else #else
pstate->rf_result = -ENOTCONN; pstate->rf_result = -ENOTCONN;
#endif #endif
}
/* Wake up the waiting thread */ /* Wake up the waiting thread */