nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Networking: Missed removal of one net_unlock() in previous commit.

Browse source
This commit is contained in:
Gregory Nutt 2017-08-31 07:29:44 -06:00
parent 7ebef900fb
commit d74381ca72
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
net/inet/inet_sockif.c
View file

@ -757,7 +757,7 @@ static int inet_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
if (psock->s_type != SOCK_STREAM)
{
nerr("ERROR: Inappropreat socket type: %d\n", psock->s_type);
nerr("ERROR: Inappropriate socket type: %d\n", psock->s_type);
return -EOPNOTSUPP;
}
@ -813,13 +813,15 @@ static int inet_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
#ifdef CONFIG_NET_TCP
#ifdef NET_TCP_HAVE_STACK
/* Perform the local accept operation (the network locked must be locked) */
/* Perform the local accept operation (the network locked must be locked
* by the caller).
*/
ret = psock_tcp_accept(psock, addr, addrlen, &newsock->s_conn);
if (ret < 0)
{
nerr("ERROR: psock_tcp_accept failed: %d\n", ret);
goto errout_with_lock;
return ret;
}
/* Begin monitoring for TCP connection events on the newly connected
@ -834,22 +836,17 @@ static int inet_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
* everything we have done and return a failure.
*/
goto errout_after_accept;
psock_close(newsock);
return ret;
}
return OK;
errout_after_accept:
psock_close(newsock);
errout_with_lock:
net_unlock();
return ret;
#else
nwarn("WARNING: SOCK_STREAM not supported in this configuration\n");
return -EOPNOTSUPP;
#endif /* NET_TCP_HAVE_STACK */
#else
nwarn("WARNING: TCP/IP not supported in this configuration\n");
return -EOPNOTSUPP;