samples: net: Change samples to support new IPv4 netmask setting API

Make sure that the samples use the new IPv4 netmask setting API.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>

samples/boards/nxp_s32/netc/src/main.c

@@ -54,12 +54,14 @@ static int setup_iface(struct net_if *iface, const char *ipv6_addr,
 		LOG_INF("IPv4 address: %s", ipv4_addr);
 
 		if (netmask && netmask[0]) {
-			if (net_addr_pton(AF_INET, netmask, &addr4)) {
+			struct in_addr nm;
+
+			if (net_addr_pton(AF_INET, netmask, &nm)) {
 				LOG_ERR("Invalid netmask: %s", netmask);
 				return -EINVAL;
 			}
 
-			net_if_ipv4_set_netmask(iface, &addr4);
+			net_if_ipv4_set_netmask_by_addr(iface, &addr4, &nm);
 		}
 	}
 

samples/net/dhcpv4_client/src/main.c

@@ -50,18 +50,18 @@ static void handler(struct net_mgmt_event_callback *cb,
 	for (i = 0; i < NET_IF_MAX_IPV4_ADDR; i++) {
 		char buf[NET_IPV4_ADDR_LEN];
 
-		if (iface->config.ip.ipv4->unicast[i].addr_type !=
+		if (iface->config.ip.ipv4->unicast[i].ipv4.addr_type !=
 							NET_ADDR_DHCP) {
 			continue;
 		}
 
 		LOG_INF("   Address[%d]: %s", net_if_get_by_iface(iface),
 			net_addr_ntop(AF_INET,
-			    &iface->config.ip.ipv4->unicast[i].address.in_addr,
+			    &iface->config.ip.ipv4->unicast[i].ipv4.address.in_addr,
 						  buf, sizeof(buf)));
 		LOG_INF("    Subnet[%d]: %s", net_if_get_by_iface(iface),
 			net_addr_ntop(AF_INET,
-				       &iface->config.ip.ipv4->netmask,
+				       &iface->config.ip.ipv4->unicast[i].netmask,
 				       buf, sizeof(buf)));
 		LOG_INF("    Router[%d]: %s", net_if_get_by_iface(iface),
 			net_addr_ntop(AF_INET,

samples/net/dns_resolve/src/main.c

@@ -168,6 +168,7 @@ static void print_dhcpv4_addr(struct net_if *iface, struct net_if_addr *if_addr,
 {
 	bool *found = (bool *)user_data;
 	char hr_addr[NET_IPV4_ADDR_LEN];
+	struct in_addr netmask;
 
 	if (*found) {
 		return;
@@ -181,10 +182,11 @@ static void print_dhcpv4_addr(struct net_if *iface, struct net_if_addr *if_addr,
 		net_addr_ntop(AF_INET, &if_addr->address.in_addr,
 			      hr_addr, NET_IPV4_ADDR_LEN));
 	LOG_INF("Lease time: %u seconds", iface->config.dhcpv4.lease_time);
+
+	netmask = net_if_ipv4_get_netmask_by_addr(iface,
+						  &if_addr->address.in_addr);
 	LOG_INF("Subnet: %s",
-		net_addr_ntop(AF_INET,
-			      &iface->config.ip.ipv4->netmask,
-			      hr_addr, NET_IPV4_ADDR_LEN));
+		net_addr_ntop(AF_INET, &netmask, hr_addr, NET_IPV4_ADDR_LEN));
 	LOG_INF("Router: %s",
 		net_addr_ntop(AF_INET,
 			      &iface->config.ip.ipv4->gw,

samples/net/ipv4_autoconf/src/main.c

@@ -41,13 +41,17 @@ static void handler(struct net_mgmt_event_callback *cb,
 	for (i = 0; i < NET_IF_MAX_IPV4_ADDR; i++) {
 		char buf[NET_IPV4_ADDR_LEN];
 
-		if (cfg->ip.ipv4->unicast[i].addr_type != NET_ADDR_AUTOCONF) {
+		if (cfg->ip.ipv4->unicast[i].ipv4.addr_type != NET_ADDR_AUTOCONF) {
 			continue;
 		}
 
 		LOG_INF("Your address: %s",
 			net_addr_ntop(AF_INET,
-				    &cfg->ip.ipv4->unicast[i].address.in_addr,
+				    &cfg->ip.ipv4->unicast[i].ipv4.address.in_addr,
+				    buf, sizeof(buf)));
+		LOG_INF("Your netmask: %s",
+			net_addr_ntop(AF_INET,
+				    &cfg->ip.ipv4->unicast[i].netmask,
 				    buf, sizeof(buf)));
 	}
 }

samples/net/mdns_responder/src/vlan.c

@@ -86,12 +86,14 @@ static int setup_iface(struct net_if *iface, const char *ipv6_addr,
 		}
 
 		if (netmask && netmask[0]) {
-			if (net_addr_pton(AF_INET, netmask, &addr4)) {
+			struct in_addr nm;
+
+			if (net_addr_pton(AF_INET, netmask, &nm)) {
 				LOG_ERR("Invalid netmask: %s", ipv4_addr);
 				return -EINVAL;
 			}
 
-			net_if_ipv4_set_netmask(iface, &addr4);
+			net_if_ipv4_set_netmask_by_addr(iface, &addr4, &nm);
 		}
 	}
 

samples/net/sockets/echo_server/src/vlan.c

@@ -86,12 +86,14 @@ static int setup_iface(struct net_if *iface, const char *ipv6_addr,
 		}
 
 		if (netmask && netmask[0]) {
-			if (net_addr_pton(AF_INET, netmask, &addr4)) {
+			struct in_addr nm;
+
+			if (net_addr_pton(AF_INET, netmask, &nm)) {
 				LOG_ERR("Invalid netmask: %s", ipv4_addr);
 				return -EINVAL;
 			}
 
-			net_if_ipv4_set_netmask(iface, &addr4);
+			net_if_ipv4_set_netmask_by_addr(iface, &addr4, &nm);
 		}
 	}
 

samples/net/virtual/src/main.c

@@ -302,12 +302,14 @@ try_ipv4:
 		}
 
 		if (netmask) {
-			if (net_addr_pton(AF_INET, netmask, &addr4)) {
+			struct in_addr nm;
+
+			if (net_addr_pton(AF_INET, netmask, &nm)) {
 				LOG_ERR("Invalid netmask: %s", netmask);
 				return -EINVAL;
 			}
 
-			net_if_ipv4_set_netmask(iface, &addr4);
+			net_if_ipv4_set_netmask_by_addr(iface, &addr4, &nm);
 		}
 
 		if (!peer4addr || *peer4addr == '\0') {

samples/subsys/mgmt/hawkbit/src/dhcp.c

@@ -30,7 +30,7 @@ static void handler(struct net_mgmt_event_callback *cb,
 	}
 
 	for (i = 0; i < NET_IF_MAX_IPV4_ADDR; i++) {
-		if (iface->config.ip.ipv4->unicast[i].addr_type !=
+		if (iface->config.ip.ipv4->unicast[i].ipv4.addr_type !=
 		    NET_ADDR_DHCP) {
 			continue;
 		}