samples: mqtt_sn: add support for IPv6

Like other samples, this moves to net_ipaddr_parse, which can handle IPv4
and IPv6. Additionally, it parses the port as well which removes the need
to have separate Kconfigs for addresses and ports, thus simplifying the
code.

Signed-off-by: Michael Zimmermann <[email protected]>

Author: M1cha

samples/net/mqtt_sn_publisher/Kconfig

@@ -8,18 +8,12 @@ mainmenu "MQTT-SN sample application"
 config NET_SAMPLE_MQTT_SN_STATIC_GATEWAY
 	bool "Whether to statically define the Gateway. Will use Search procedure if False."
 
-config NET_SAMPLE_MQTT_SN_GATEWAY_IP
-	string "IP of the MQTT-SN gateway"
+config NET_SAMPLE_MQTT_SN_GATEWAY_ADDRESS
+	string "IP and port of the MQTT-SN gateway"
 	depends on NET_SAMPLE_MQTT_SN_STATIC_GATEWAY
 
-config NET_SAMPLE_MQTT_SN_GATEWAY_PORT
-	int "Port of the MQTT-SN gateway"
-
-config NET_SAMPLE_MQTT_SN_BROADCAST_IP
-	string "IP of the Broadcast address"
-
-config NET_SAMPLE_MQTT_SN_BROADCAST_PORT
-	int "Port of the MQTT-SN broadcast"
+config NET_SAMPLE_MQTT_SN_BROADCAST_ADDRESS
+	string "IP and port of the Broadcast address"
 
 config NET_SAMPLE_MQTT_SN_BUFFER_SIZE
 	int "Size of the TX and RX buffers"

samples/net/mqtt_sn_publisher/prj.conf

@@ -2,7 +2,7 @@
 CONFIG_NETWORKING=y
 CONFIG_NET_UDP=y
 CONFIG_NET_IPV4=y
-CONFIG_NET_IPV6=n
+CONFIG_NET_IPV6=y
 CONFIG_NET_SOCKETS=y
 CONFIG_ZVFS_OPEN_MAX=6
 CONFIG_NET_CONNECTION_MANAGER=y
@@ -38,8 +38,7 @@ CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
 CONFIG_MQTT_SN_LIB=y
 CONFIG_MQTT_SN_TRANSPORT_UDP=y
 CONFIG_MQTT_SN_LIB_BROADCAST_RADIUS=1
+CONFIG_MQTT_SN_LIB_MAX_ADDR_SIZE=24
 CONFIG_NET_SAMPLE_MQTT_SN_STATIC_GATEWAY=y
-CONFIG_NET_SAMPLE_MQTT_SN_GATEWAY_IP="192.0.2.2"
-CONFIG_NET_SAMPLE_MQTT_SN_GATEWAY_PORT=10000
-CONFIG_NET_SAMPLE_MQTT_SN_BROADCAST_IP="225.1.1.1"
-CONFIG_NET_SAMPLE_MQTT_SN_BROADCAST_PORT=1883
+CONFIG_NET_SAMPLE_MQTT_SN_GATEWAY_ADDRESS="192.0.2.2:10000"
+CONFIG_NET_SAMPLE_MQTT_SN_BROADCAST_ADDRESS="225.1.1.1:1883"

samples/net/mqtt_sn_publisher/src/udp.c

@@ -18,9 +18,9 @@
 LOG_MODULE_DECLARE(mqtt_sn_publisher_sample);
 
 #ifdef CONFIG_NET_SAMPLE_MQTT_SN_STATIC_GATEWAY
-#define SAMPLE_GW_IP CONFIG_NET_SAMPLE_MQTT_SN_GATEWAY_IP
+#define SAMPLE_GW_ADDRESS CONFIG_NET_SAMPLE_MQTT_SN_GATEWAY_ADDRESS
 #else
-#define SAMPLE_GW_IP ""
+#define SAMPLE_GW_ADDRESS ""
 #endif
 
 static void process_thread(void);
@@ -126,19 +126,19 @@ static int do_work(void)
 
 static void process_thread(void)
 {
-	struct sockaddr_in bcaddr = {0};
+	struct sockaddr bcaddr = {0};
 	int err;
-	LOG_DBG("Parsing Broadcast IP " CONFIG_NET_SAMPLE_MQTT_SN_BROADCAST_IP);
-	bcaddr.sin_family = AF_INET;
-	bcaddr.sin_port = htons(CONFIG_NET_SAMPLE_MQTT_SN_BROADCAST_PORT);
-	err = zsock_inet_pton(AF_INET, CONFIG_NET_SAMPLE_MQTT_SN_BROADCAST_IP,
-			      &bcaddr.sin_addr);
-	__ASSERT(err == 1, "inet_pton() failed %d", err);
+	bool success;
+
+	LOG_DBG("Parsing Broadcast Address " CONFIG_NET_SAMPLE_MQTT_SN_BROADCAST_ADDRESS);
+	success = net_ipaddr_parse(CONFIG_NET_SAMPLE_MQTT_SN_BROADCAST_ADDRESS,
+				   strlen(CONFIG_NET_SAMPLE_MQTT_SN_BROADCAST_ADDRESS), &bcaddr);
+	__ASSERT(success, "net_ipaddr_parse() failed");
 
 	LOG_INF("Waiting for connection...");
 	LOG_HEXDUMP_DBG(&bcaddr, sizeof(bcaddr), " broadcast address");
 
-	err = mqtt_sn_transport_udp_init(&tp, (struct sockaddr *)&bcaddr, sizeof((bcaddr)));
+	err = mqtt_sn_transport_udp_init(&tp, &bcaddr, sizeof((bcaddr)));
 	__ASSERT(err == 0, "mqtt_sn_transport_udp_init() failed %d", err);
 
 	err = mqtt_sn_client_init(&mqtt_client, &client_id, &tp.tp, evt_cb, tx_buf, sizeof(tx_buf),
@@ -147,15 +147,24 @@ static void process_thread(void)
 
 	if (IS_ENABLED(CONFIG_NET_SAMPLE_MQTT_SN_STATIC_GATEWAY)) {
 		LOG_INF("Adding predefined Gateway");
-		struct sockaddr_in gwaddr = {0};
+		struct sockaddr gwaddr = {0};
 
-		LOG_DBG("Parsing Gateway IP %s", SAMPLE_GW_IP);
-		gwaddr.sin_family = AF_INET;
-		gwaddr.sin_port = htons(CONFIG_NET_SAMPLE_MQTT_SN_GATEWAY_PORT);
-		err = zsock_inet_pton(AF_INET, SAMPLE_GW_IP, &gwaddr.sin_addr);
-		__ASSERT(err == 1, "inet_pton() failed %d", err);
+		LOG_DBG("Parsing Gateway address %s", SAMPLE_GW_ADDRESS);
+		success = net_ipaddr_parse(SAMPLE_GW_ADDRESS, strlen(SAMPLE_GW_ADDRESS), &gwaddr);
+		__ASSERT(success, "net_ipaddr_parse() failed");
 		struct mqtt_sn_data gwaddr_data = {.data = (uint8_t *)&gwaddr,
 						   .size = sizeof(gwaddr)};
+		/* Reduce size to allow this to work with smaller values for
+		 * CONFIG_MQTT_SN_LIB_MAX_ADDR_SIZE.
+		 */
+		switch (gwaddr.sa_family) {
+		case AF_INET:
+			gwaddr_data.size = sizeof(struct sockaddr_in);
+			break;
+		case AF_INET6:
+			gwaddr_data.size = sizeof(struct sockaddr_in6);
+			break;
+		}
 
 		err = mqtt_sn_add_gw(&mqtt_client, 0x1f, gwaddr_data);
 		__ASSERT(err == 0, "mqtt_sn_add_gw() failed %d", err);