[54/90] connection: Add 'is_addr_any_str'.

Commit Message

Grant Erickson Dec. 6, 2023, 11:50 p.m. UTC

From: Grant Erickson <[e-mail]>

This adds 'is_addr_any_str' which can successfully determine whether a
specified text-formatted IP address is the "any" or "unspecified"
address for either an IPv4 or an IPv6 address.

Application of 'is_addr_any_str' helps neutralize any/unspecified
address string comparisons and moves IPv4- and IPv6-specific blocks of
code closer to unification.
---
 src/connection.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

Patch

diff --git a/src/connection.c b/src/connection.c
index 1f8152e7a7e4..cfae70f2055c 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -620,6 +620,15 @@  static bool is_ipv6_addr_any_str(const char *address)
 	return g_strcmp0(ipv6_addr_any_str, address) == 0;
 }
 
+static bool is_addr_any_str(const char *address)
+{
+	if (!address)
+		return false;
+
+	return (!strchr(address, ':') && is_ipv4_addr_any_str(address)) ||
+				is_ipv6_addr_any_str(address);
+}
+
 /**
  *  @brief
  *    Find the gateway, or default router, configuration associated
@@ -934,7 +943,7 @@  static void set_vpn_routes(struct gateway_data *new_gateway,
 
 		DBG("active gw %s", active_gateway->ipv4_config->gateway);
 
-		if (!is_ipv4_addr_any_str(active_gateway->ipv4_config->gateway))
+		if (!is_addr_any_str(active_gateway->ipv4_config->gateway))
 			dest = active_gateway->ipv4_config->gateway;
 		else
 			dest = NULL;
@@ -953,7 +962,7 @@  static void set_vpn_routes(struct gateway_data *new_gateway,
 
 		DBG("active gw %s", active_gateway->ipv6_config->gateway);
 
-		if (!is_ipv6_addr_any_str(active_gateway->ipv6_config->gateway))
+		if (!is_addr_any_str(active_gateway->ipv6_config->gateway))
 			dest = active_gateway->ipv6_config->gateway;
 		else
 			dest = NULL;
@@ -1489,7 +1498,7 @@  static int set_ipv4_high_priority_default_gateway_route_cb(
 			data, data->index, config->vpn_ip,
 			config->vpn_phy_index,
 			config->vpn_phy_ip);
-	} else if (is_ipv4_addr_any_str(config->gateway)) {
+	} else if (is_addr_any_str(config->gateway)) {
 		err = connman_inet_set_gateway_interface(
 					data->index);
 		if (err < 0)
@@ -1528,7 +1537,7 @@  static int set_ipv6_high_priority_default_gateway_route_cb(
 			data, data->index, config->vpn_ip,
 			config->vpn_phy_index,
 			config->vpn_phy_ip);
-	} else if (is_ipv6_addr_any_str(config->gateway)) {
+	} else if (is_addr_any_str(config->gateway)) {
 		err = connman_inet_set_ipv6_gateway_interface(
 					data->index);
 		if (err < 0)
@@ -1646,7 +1655,7 @@  static int unset_ipv4_high_priority_default_gateway_route_cb(
 			data, data->index, config->vpn_ip,
 			config->vpn_phy_index,
 			config->vpn_phy_ip);
-	} else if (is_ipv4_addr_any_str(config->gateway)) {
+	} else if (is_addr_any_str(config->gateway)) {
 		err = connman_inet_clear_gateway_interface(data->index);
 		if (err < 0)
 			goto done;
@@ -1682,7 +1691,7 @@  static int unset_ipv6_high_priority_default_gateway_route_cb(
 			data, data->index, config->vpn_ip,
 			config->vpn_phy_index,
 			config->vpn_phy_ip);
-	} else if (is_ipv6_addr_any_str(config->gateway)) {
+	} else if (is_addr_any_str(config->gateway)) {
 		err = connman_inet_clear_ipv6_gateway_interface(data->index);
 		if (err < 0)
 			goto done;
@@ -2336,7 +2345,7 @@  static void add_host_route(int family, int index, const char *gateway,
 {
 	switch (family) {
 	case AF_INET:
-		if (!is_ipv4_addr_any_str(gateway)) {
+		if (!is_addr_any_str(gateway)) {
 			/*
 			 * We must not set route to the phy dev gateway in
 			 * VPN link. The packets to VPN link might be routed
@@ -2361,7 +2370,7 @@  static void add_host_route(int family, int index, const char *gateway,
 		break;
 
 	case AF_INET6:
-		if (!is_ipv6_addr_any_str(gateway)) {
+		if (!is_addr_any_str(gateway)) {
 			if (service_type != CONNMAN_SERVICE_TYPE_VPN)
 				connman_inet_add_ipv6_host_route(index,
 								gateway, NULL);