net: context: Fix issues in context_sendto() function (48897a90) · Commits · Wenxi XU / zephyr

Fixed issue when `sendmsg()` was in use and `CONFIG_NET_IPV6` and `CONFIG_NET_IPV4_MAPPING_TO_IPV6` were in use, as `dst_addr` argument of `context_sendto()` was passed NULL, but also used to determine `sa_family`. Use msghdr, if available, to determine if v4 to v6 mapping is present. Also set `dst_addr` to unmapped value when v4 to v6 mapping is used. Signed-off-by:

Cristian Bulacu <cristian.bulacu@nxp.com>

subsys/net/ip/net_context.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -2411,8 +2411,18 @@ static int context_sendto(struct net_context *context,
		if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6) &&
		IS_ENABLED(CONFIG_NET_IPV6) &&
		net_context_get_family(context) == AF_INET6 &&
		dst_addr != NULL &&
		dst_addr->sa_family == AF_INET) {
		family = AF_INET;
		} else if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6) &&
		IS_ENABLED(CONFIG_NET_IPV6) && msghdr != NULL) {
		const struct sockaddr_in6 *addr6 = msghdr->msg_name;

		if (net_ipv6_addr_is_v4_mapped(&addr6->sin6_addr)) {
		family = AF_INET;
		} else {
		family = net_context_get_family(context);
		}
		} else {
		family = net_context_get_family(context);
		}
		@@ -2499,6 +2509,10 @@ static int context_sendto(struct net_context *context,
		net_ipaddr_copy(&mapped.sin_addr,
		(struct in_addr *)(&addr6->sin6_addr.s6_addr32[3]));
		addr4 = &mapped;

		/* For sendmsg(), the dst_addr is NULL so set it here.
		*/
		dst_addr = (const struct sockaddr *)addr4;
		}

		if (addrlen < sizeof(struct sockaddr_in)) {

Admin message