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

net/local: fix accept for local stream sockets

Browse Source
This commit is contained in:
Jussi Kivilinna 2017-07-31 07:36:54 -06:00 committed by Gregory Nutt
parent 20dc5ad3b4
commit 52becb7811
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/local/local.h
View File

@ -359,7 +359,7 @@ int local_listen(FAR struct socket *psock, int backlog);
#ifdef CONFIG_NET_LOCAL_STREAM #ifdef CONFIG_NET_LOCAL_STREAM
int local_accept(FAR struct socket *psock, FAR struct sockaddr *addr, int local_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
FAR socklen_t *addrlen, FAR void **newconn); FAR socklen_t *addrlen, FAR struct socket *newsock);
#endif #endif
/**************************************************************************** /****************************************************************************

11
net/local/local_accept.c
View File

@ -111,8 +111,7 @@ static int local_waitlisten(FAR struct local_conn_s *server)
****************************************************************************/ ****************************************************************************/
int local_accept(FAR struct socket *psock, FAR struct sockaddr *addr, int local_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
FAR socklen_t *addrlen, FAR void **newconn) FAR socklen_t *addrlen, FAR struct socket *newsock)
{ {
FAR struct local_conn_s *server; FAR struct local_conn_s *server;
FAR struct local_conn_s *client; FAR struct local_conn_s *client;
@ -122,6 +121,7 @@ int local_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
/* Some sanity checks */ /* Some sanity checks */
DEBUGASSERT(psock && psock->s_conn); DEBUGASSERT(psock && psock->s_conn);
DEBUGASSERT(newsock && !newsock->s_conn);
/* Is the socket a stream? */ /* Is the socket a stream? */
@ -233,9 +233,12 @@ int local_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
if (ret == OK) if (ret == OK)
{ {
/* Return the client connection structure */ /* Setup the client socket structure */
*newconn = (FAR void *)conn; newsock->s_domain = psock->s_domain;
newsock->s_type = SOCK_STREAM;
newsock->s_sockif = psock->s_sockif;
newsock->s_conn = (FAR void *)conn;
} }
/* Signal the client with the result of the connection */ /* Signal the client with the result of the connection */