michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: conn: Check connection address family properly

Browse source 
When a connection handler was registered, the checker function
introduced in commit 43b37cef ("Check duplicate UDP/TCP connection
handlers") did not check the address family (IPv4 or IPv6) of
the local end point properly. This caused duplicate connection
error to be returned to the caller.

Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
This commit is contained in:
Jukka Rissanen 2017-05-19 11:46:21 +03:00
commit dea9b2b6c3
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
subsys/net/ip/connection.c
View file

@ -456,7 +456,9 @@ static int find_conn_handler(enum net_ip_protocol proto,
} }
#if defined(CONFIG_NET_IPV6) #if defined(CONFIG_NET_IPV6)
if (remote_addr->family == AF_INET6) { if (remote_addr->family == AF_INET6 &&
remote_addr->family ==
conns[i].remote_addr.family) {
if (!net_ipv6_addr_cmp( if (!net_ipv6_addr_cmp(
&net_sin6(remote_addr)->sin6_addr, &net_sin6(remote_addr)->sin6_addr,
&net_sin6(&conns[i].remote_addr)-> &net_sin6(&conns[i].remote_addr)->
@ -466,7 +468,9 @@ static int find_conn_handler(enum net_ip_protocol proto,
} else } else
#endif #endif
#if defined(CONFIG_NET_IPV4) #if defined(CONFIG_NET_IPV4)
if (remote_addr->family == AF_INET) { if (remote_addr->family == AF_INET &&
remote_addr->family ==
conns[i].remote_addr.family) {
if (!net_ipv4_addr_cmp( if (!net_ipv4_addr_cmp(
&net_sin(remote_addr)->sin_addr, &net_sin(remote_addr)->sin_addr,
&net_sin(&conns[i].remote_addr)-> &net_sin(&conns[i].remote_addr)->
@ -490,7 +494,9 @@ static int find_conn_handler(enum net_ip_protocol proto,
} }
#if defined(CONFIG_NET_IPV6) #if defined(CONFIG_NET_IPV6)
if (local_addr->family == AF_INET6) { if (local_addr->family == AF_INET6 &&
local_addr->family ==
conns[i].local_addr.family) {
if (!net_ipv6_addr_cmp( if (!net_ipv6_addr_cmp(
&net_sin6(local_addr)->sin6_addr, &net_sin6(local_addr)->sin6_addr,
&net_sin6(&conns[i].local_addr)-> &net_sin6(&conns[i].local_addr)->
@ -500,7 +506,9 @@ static int find_conn_handler(enum net_ip_protocol proto,
} else } else
#endif #endif
#if defined(CONFIG_NET_IPV4) #if defined(CONFIG_NET_IPV4)
if (local_addr->family == AF_INET) { if (local_addr->family == AF_INET &&
local_addr->family ==
conns[i].local_addr.family) {
if (!net_ipv4_addr_cmp( if (!net_ipv4_addr_cmp(
&net_sin(local_addr)->sin_addr, &net_sin(local_addr)->sin_addr,
&net_sin(&conns[i].local_addr)-> &net_sin(&conns[i].local_addr)->