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

make sure conn's domain is match with addr's family

Browse source
This commit is contained in:
liyi 2022-07-29 11:11:46 +08:00 committed by Xiang Xiao
parent 93f719bccb
commit b232508bd9
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
net/inet/inet_sockif.c
View file

@ -722,15 +722,23 @@ static int inet_connect(FAR struct socket *psock,
#if defined(CONFIG_NET_TCP) && defined(NET_TCP_HAVE_STACK)
case SOCK_STREAM:
{
FAR struct socket_conn_s *conn = psock->s_conn;
FAR struct tcp_conn_s *conn = psock->s_conn;
/* Verify that the socket is not already connected */
if (_SS_ISCONNECTED(conn->s_flags))
if (_SS_ISCONNECTED(conn->sconn.s_flags))
{
return -EISCONN;
}
#if defined(CONFIG_NET_IPv4) && defined(CONFIG_NET_IPv6)
if (conn->domain != addr->sa_family)
{
nerr("conn's domain must be the same as addr's family!\n");
return -EPROTOTYPE;
}
#endif
/* It's not ... Connect the TCP/IP socket */
return psock_tcp_connect(psock, addr);
@ -756,6 +764,14 @@ static int inet_connect(FAR struct socket *psock,
/* Perform the connect/disconnect operation */
conn = (FAR struct udp_conn_s *)psock->s_conn;
#if defined(CONFIG_NET_IPv4) && defined(CONFIG_NET_IPv6)
if (conn->domain != addr->sa_family)
{
nerr("conn's domain must be the same as addr's family!\n");
return -EPROTOTYPE;
}
#endif
ret = udp_connect(conn, addr);
if (ret < 0 || addr == NULL)
{