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

recvfrom(): Missing else in conditional logic of recvfrom()

Browse Source
This commit is contained in:
Gregory Nutt 2015-01-27 14:14:53 -06:00
parent a8f6e24554
commit 8f517ad0c1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/socket/recvfrom.c
View File

@ -115,7 +115,7 @@ struct recvfrom_s
* Copy the read data from the packet * Copy the read data from the packet
* *
* Parameters: * Parameters:
* dev The sructure of the network driver that caused the interrupt * dev The structure of the network driver that caused the interrupt
* pstate recvfrom state structure * pstate recvfrom state structure
* *
* Returned Value: * Returned Value:
@ -678,11 +678,11 @@ static uint16_t recvfrom_tcpinterrupt(FAR struct net_driver_s *dev,
* 1) If CONFIG_NET_TCP_RECVDELAY == 0 then we will consider the * 1) If CONFIG_NET_TCP_RECVDELAY == 0 then we will consider the
* TCP/IP transfer complete as soon as any data has been received. * TCP/IP transfer complete as soon as any data has been received.
* This is safe because if any additional data is received, it * This is safe because if any additional data is received, it
* will be retained inthe TCP/IP read-ahead buffer until the * will be retained in the TCP/IP read-ahead buffer until the
* next receive is performed. * next receive is performed.
* 2) CONFIG_NET_TCP_RECVDELAY > 0 may be set to wait a little * 2) CONFIG_NET_TCP_RECVDELAY > 0 may be set to wait a little
* bit to determine if more data will be received. You might * bit to determine if more data will be received. You might
* do this if read-ahead buffereing is disabled and we want to * do this if read-ahead buffering is disabled and we want to
* minimize the loss of back-to-back packets. In this case, * minimize the loss of back-to-back packets. In this case,
* the transfer is complete when either a) the entire user buffer * the transfer is complete when either a) the entire user buffer
* is full or 2) when the receive timeout occurs (below). * is full or 2) when the receive timeout occurs (below).
@ -1032,7 +1032,7 @@ static void recvfrom_init(FAR struct socket *psock, FAR void *buf,
#endif #endif
} }
/* The only uninitialization that has to be performed is destroying the /* The only un-initialization that has to be performed is destroying the
* semaphore. * semaphore.
*/ */
@ -1625,6 +1625,7 @@ ssize_t psock_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NET_IPv4 #ifdef CONFIG_NET_IPv4
else
#endif #endif
{ {
minlen = sizeof(struct sockaddr_in6); minlen = sizeof(struct sockaddr_in6);