net: mqtt_sn: udp: use correct get/setsockopt parameters for IPv6

On IPv6, IPPROTO_IPV6 needs to be replaced by IPPROTO_IP and
IP_MULTICAST_TTL by IPV6_MULTICAST_HOPS.

Signed-off-by: Aurelien Jarno <[email protected]>

Author: aurel32

subsys/net/lib/mqtt_sn/mqtt_sn_transport_udp.c

@@ -152,8 +152,18 @@ static int tp_udp_init(struct mqtt_sn_transport *transport)
 	}
 
 	optval = CONFIG_MQTT_SN_LIB_BROADCAST_RADIUS;
-	err = zsock_setsockopt(udp->sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_TTL,
-			       &optval, sizeof(optval));
+	if (udp->bcaddr.sa_family == NET_AF_INET && IS_ENABLED(CONFIG_NET_IPV4)) {
+		err = zsock_setsockopt(udp->sock, NET_IPPROTO_IP,
+				       ZSOCK_IP_MULTICAST_TTL, &optval,
+				       sizeof(optval));
+	} else if (udp->bcaddr.sa_family == NET_AF_INET6 && IS_ENABLED(CONFIG_NET_IPV6)) {
+		err = zsock_setsockopt(udp->sock, NET_IPPROTO_IPV6,
+				       ZSOCK_IPV6_MULTICAST_HOPS, &optval,
+				       sizeof(optval));
+	} else {
+		LOG_ERR("Unknown AF");
+		return -EINVAL;
+	}
 	if (err < 0) {
 		return -errno;
 	}
@@ -177,18 +187,28 @@ static int tp_udp_sendto(struct mqtt_sn_client *client, void *buf, size_t sz, co
 	net_socklen_t ttl_len;
 
 	if (dest_addr == NULL) {
+		int level, optname;
+
 		LOG_HEXDUMP_DBG(buf, sz, "Sending Broadcast UDP packet");
 
 		/* Set ttl if requested value does not match existing*/
-		rc = zsock_getsockopt(udp->sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_TTL,
-				      &ttl, &ttl_len);
+		if (udp->bcaddr.sa_family == NET_AF_INET && IS_ENABLED(CONFIG_NET_IPV4)) {
+			level = NET_IPPROTO_IP;
+			optname = ZSOCK_IP_MULTICAST_TTL;
+		} else if (udp->bcaddr.sa_family == NET_AF_INET6 && IS_ENABLED(CONFIG_NET_IPV6)) {
+			level = NET_IPPROTO_IPV6;
+			optname = ZSOCK_IPV6_MULTICAST_HOPS;
+		} else {
+			LOG_ERR("Unknown AF");
+			return -EINVAL;
+		}
+		rc = zsock_getsockopt(udp->sock, level, optname, &ttl, &ttl_len);
 		if (rc < 0) {
 			return -errno;
 		}
 		if (ttl != addrlen) {
 			ttl = addrlen;
-			rc = zsock_setsockopt(udp->sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_TTL,
-					      &ttl, sizeof(ttl));
+			rc = zsock_setsockopt(udp->sock, level, optname, &ttl, sizeof(ttl));
 			if (rc < 0) {
 				return -errno;
 			}