mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 04:24:32 +00:00
all: use nm_utils_ipaddr_is_valid() instead of nm_utils_ipaddr_valid()
We should use the same "is-valid" function everywhere. Since nm_utils_ipaddr_valid() is part of libnm, it does not qualify. Use nm_utils_ipaddr_is_valid() instead.
This commit is contained in:
parent
95ea3ccad8
commit
8f3b43f009
|
@ -364,7 +364,7 @@ _parse_ip_route (int family,
|
|||
for (i = 1; routev[i]; i++) {
|
||||
gint64 tmp64;
|
||||
|
||||
if (nm_utils_ipaddr_valid (family, routev[i])) {
|
||||
if (nm_utils_ipaddr_is_valid (family, routev[i])) {
|
||||
if (metric != -1 || attrs) {
|
||||
g_set_error (error, 1, 0, _("the next hop ('%s') must be first"), routev[i]);
|
||||
return NULL;
|
||||
|
@ -3336,7 +3336,7 @@ _set_fcn_ip_config_gateway (ARGS_SET_FCN)
|
|||
|
||||
value = nm_strstrip_avoid_copy_a (300, value, &value_to_free);
|
||||
|
||||
if (!nm_utils_ipaddr_valid (addr_family, value)) {
|
||||
if (!nm_utils_ipaddr_is_valid (addr_family, value)) {
|
||||
g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT,
|
||||
_("invalid gateway address '%s'"),
|
||||
value);
|
||||
|
|
|
@ -192,7 +192,7 @@ ip_addresses_check_and_copy (GBinding *binding,
|
|||
strings = g_value_get_boxed (source_value);
|
||||
|
||||
for (i = 0; strings[i]; i++) {
|
||||
if (!nm_utils_ipaddr_valid (addr_family, strings[i]))
|
||||
if (!nm_utils_ipaddr_is_valid (addr_family, strings[i]))
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
@ -251,7 +251,7 @@ ip_gateway_from_string (GBinding *binding,
|
|||
const char *gateway;
|
||||
|
||||
gateway = g_value_get_string (source_value);
|
||||
if (gateway && !nm_utils_ipaddr_valid (addr_family, gateway))
|
||||
if (gateway && !nm_utils_ipaddr_is_valid (addr_family, gateway))
|
||||
gateway = NULL;
|
||||
|
||||
g_value_set_string (target_value, gateway);
|
||||
|
@ -457,7 +457,7 @@ ip_route_transform_from_next_hop_string (GBinding *binding,
|
|||
|
||||
text = g_value_get_string (source_value);
|
||||
if (*text) {
|
||||
if (!nm_utils_ipaddr_valid (addr_family, text))
|
||||
if (!nm_utils_ipaddr_is_valid (addr_family, text))
|
||||
return FALSE;
|
||||
} else
|
||||
text = NULL;
|
||||
|
|
|
@ -107,7 +107,7 @@ valid_ip (int family, const char *ip, GError **error)
|
|||
family == AF_INET ? _("Missing IPv4 address") : _("Missing IPv6 address"));
|
||||
return FALSE;
|
||||
}
|
||||
if (!nm_utils_ipaddr_valid (family, ip)) {
|
||||
if (!nm_utils_ipaddr_is_valid (family, ip)) {
|
||||
g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
|
||||
family == AF_INET ? _("Invalid IPv4 address '%s'") : _("Invalid IPv6 address '%s'"),
|
||||
ip);
|
||||
|
@ -433,7 +433,7 @@ nm_ip_address_set_address (NMIPAddress *address,
|
|||
{
|
||||
g_return_if_fail (address != NULL);
|
||||
g_return_if_fail (addr != NULL);
|
||||
g_return_if_fail (nm_utils_ipaddr_valid (address->family, addr));
|
||||
g_return_if_fail (nm_utils_ipaddr_is_valid (address->family, addr));
|
||||
|
||||
g_free (address->address);
|
||||
address->address = canonicalize_ip (address->family, addr, FALSE);
|
||||
|
@ -887,14 +887,14 @@ nm_ip_route_get_dest (NMIPRoute *route)
|
|||
* Sets the destination property of this route object.
|
||||
*
|
||||
* @dest must be a valid address of @route's family. If you aren't sure you
|
||||
* have a valid address, use nm_utils_ipaddr_valid() to check it.
|
||||
* have a valid address, use nm_utils_ipaddr_is_valid() to check it.
|
||||
**/
|
||||
void
|
||||
nm_ip_route_set_dest (NMIPRoute *route,
|
||||
const char *dest)
|
||||
{
|
||||
g_return_if_fail (route != NULL);
|
||||
g_return_if_fail (nm_utils_ipaddr_valid (route->family, dest));
|
||||
g_return_if_fail (nm_utils_ipaddr_is_valid (route->family, dest));
|
||||
|
||||
g_free (route->dest);
|
||||
route->dest = canonicalize_ip (route->family, dest, FALSE);
|
||||
|
@ -1009,7 +1009,7 @@ nm_ip_route_set_next_hop (NMIPRoute *route,
|
|||
const char *next_hop)
|
||||
{
|
||||
g_return_if_fail (route != NULL);
|
||||
g_return_if_fail (!next_hop || nm_utils_ipaddr_valid (route->family, next_hop));
|
||||
g_return_if_fail (!next_hop || nm_utils_ipaddr_is_valid (route->family, next_hop));
|
||||
|
||||
g_free (route->next_hop);
|
||||
route->next_hop = canonicalize_ip (route->family, next_hop, TRUE);
|
||||
|
@ -1297,7 +1297,7 @@ nm_ip_route_attribute_validate (const char *name,
|
|||
|
||||
switch (spec->str_type) {
|
||||
case 'a': /* IP address */
|
||||
if (!nm_utils_ipaddr_valid (family, string)) {
|
||||
if (!nm_utils_ipaddr_is_valid (family, string)) {
|
||||
g_set_error (error,
|
||||
NM_CONNECTION_ERROR,
|
||||
NM_CONNECTION_ERROR_FAILED,
|
||||
|
@ -1325,7 +1325,7 @@ nm_ip_route_attribute_validate (const char *name,
|
|||
return FALSE;
|
||||
}
|
||||
}
|
||||
if (!nm_utils_ipaddr_valid (family, addr)) {
|
||||
if (!nm_utils_ipaddr_is_valid (family, addr)) {
|
||||
g_set_error (error,
|
||||
NM_CONNECTION_ERROR,
|
||||
NM_CONNECTION_ERROR_FAILED,
|
||||
|
@ -3685,7 +3685,7 @@ nm_setting_ip_config_add_dns (NMSettingIPConfig *setting, const char *dns)
|
|||
|
||||
g_return_val_if_fail (NM_IS_SETTING_IP_CONFIG (setting), FALSE);
|
||||
g_return_val_if_fail (dns != NULL, FALSE);
|
||||
g_return_val_if_fail (nm_utils_ipaddr_valid (NM_SETTING_IP_CONFIG_GET_FAMILY (setting), dns), FALSE);
|
||||
g_return_val_if_fail (nm_utils_ipaddr_is_valid (NM_SETTING_IP_CONFIG_GET_FAMILY (setting), dns), FALSE);
|
||||
|
||||
priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (setting);
|
||||
|
||||
|
@ -3741,7 +3741,7 @@ nm_setting_ip_config_remove_dns_by_value (NMSettingIPConfig *setting, const char
|
|||
|
||||
g_return_val_if_fail (NM_IS_SETTING_IP_CONFIG (setting), FALSE);
|
||||
g_return_val_if_fail (dns != NULL, FALSE);
|
||||
g_return_val_if_fail (nm_utils_ipaddr_valid (NM_SETTING_IP_CONFIG_GET_FAMILY (setting), dns), FALSE);
|
||||
g_return_val_if_fail (nm_utils_ipaddr_is_valid (NM_SETTING_IP_CONFIG_GET_FAMILY (setting), dns), FALSE);
|
||||
|
||||
priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (setting);
|
||||
|
||||
|
@ -4946,7 +4946,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|||
for (i = 0; i < priv->dns->len; i++) {
|
||||
const char *dns = priv->dns->pdata[i];
|
||||
|
||||
if (!nm_utils_ipaddr_valid (NM_SETTING_IP_CONFIG_GET_FAMILY (setting), dns)) {
|
||||
if (!nm_utils_ipaddr_is_valid (NM_SETTING_IP_CONFIG_GET_FAMILY (setting), dns)) {
|
||||
g_set_error (error,
|
||||
NM_CONNECTION_ERROR,
|
||||
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
||||
|
@ -5006,7 +5006,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
if (!nm_utils_ipaddr_valid (NM_SETTING_IP_CONFIG_GET_FAMILY (setting), priv->gateway)) {
|
||||
if (!nm_utils_ipaddr_is_valid (NM_SETTING_IP_CONFIG_GET_FAMILY (setting), priv->gateway)) {
|
||||
g_set_error_literal (error,
|
||||
NM_CONNECTION_ERROR,
|
||||
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
||||
|
@ -5428,7 +5428,7 @@ set_property (GObject *object, guint prop_id,
|
|||
break;
|
||||
case PROP_GATEWAY:
|
||||
gateway = g_value_get_string (value);
|
||||
g_return_if_fail (!gateway || nm_utils_ipaddr_valid (NM_SETTING_IP_CONFIG_GET_FAMILY (setting), gateway));
|
||||
g_return_if_fail (!gateway || nm_utils_ipaddr_is_valid (NM_SETTING_IP_CONFIG_GET_FAMILY (setting), gateway));
|
||||
g_free (priv->gateway);
|
||||
priv->gateway = canonicalize_ip (NM_SETTING_IP_CONFIG_GET_FAMILY (setting), gateway, TRUE);
|
||||
break;
|
||||
|
|
|
@ -341,7 +341,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
if (priv->local && !nm_utils_ipaddr_valid (family, priv->local)) {
|
||||
if (priv->local && !nm_utils_ipaddr_is_valid (family, priv->local)) {
|
||||
g_set_error (error,
|
||||
NM_CONNECTION_ERROR,
|
||||
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
||||
|
@ -361,7 +361,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
if (!nm_utils_ipaddr_valid (family, priv->remote)) {
|
||||
if (!nm_utils_ipaddr_is_valid (family, priv->remote)) {
|
||||
g_set_error (error,
|
||||
NM_CONNECTION_ERROR,
|
||||
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
||||
|
|
|
@ -81,8 +81,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
if ( !nm_utils_ipaddr_valid (AF_INET, self->peer)
|
||||
&& !nm_utils_ipaddr_valid (AF_INET6, self->peer)) {
|
||||
if ( !nm_utils_ipaddr_is_valid (AF_INET, self->peer)
|
||||
&& !nm_utils_ipaddr_is_valid (AF_INET6, self->peer)) {
|
||||
g_set_error (error,
|
||||
NM_CONNECTION_ERROR,
|
||||
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
||||
|
|
|
@ -327,9 +327,9 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
if (nm_utils_ipaddr_valid (AF_INET, priv->remote))
|
||||
if (nm_utils_ipaddr_is_valid (AF_INET, priv->remote))
|
||||
family = AF_INET;
|
||||
else if (nm_utils_ipaddr_valid (AF_INET6, priv->remote))
|
||||
else if (nm_utils_ipaddr_is_valid (AF_INET6, priv->remote))
|
||||
family = AF_INET6;
|
||||
else {
|
||||
g_set_error (error,
|
||||
|
@ -344,7 +344,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|||
}
|
||||
|
||||
if (priv->local) {
|
||||
if (!nm_utils_ipaddr_valid (family, priv->local)) {
|
||||
if (!nm_utils_ipaddr_is_valid (family, priv->local)) {
|
||||
g_set_error (error,
|
||||
NM_CONNECTION_ERROR,
|
||||
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
||||
|
|
|
@ -248,7 +248,7 @@ build_route (KeyfileReaderInfo *info,
|
|||
|
||||
/* Next hop */
|
||||
if (gateway_str && gateway_str[0]) {
|
||||
if (!nm_utils_ipaddr_valid (family, gateway_str)) {
|
||||
if (!nm_utils_ipaddr_is_valid (family, gateway_str)) {
|
||||
/* Try workaround for routes written by broken keyfile writer.
|
||||
* Due to bug bgo#719851, an older version of writer would have
|
||||
* written "a:b:c:d::/plen,metric" if the gateway was ::, instead
|
||||
|
|
|
@ -1597,9 +1597,9 @@ nmtst_setting_ip_config_add_address (NMSettingIPConfig *s_ip,
|
|||
|
||||
g_assert (s_ip);
|
||||
|
||||
if (nm_utils_ipaddr_valid (AF_INET, address))
|
||||
if (nm_utils_ipaddr_is_valid (AF_INET, address))
|
||||
family = AF_INET;
|
||||
else if (nm_utils_ipaddr_valid (AF_INET6, address))
|
||||
else if (nm_utils_ipaddr_is_valid (AF_INET6, address))
|
||||
family = AF_INET6;
|
||||
else
|
||||
g_assert_not_reached ();
|
||||
|
@ -1622,9 +1622,9 @@ nmtst_setting_ip_config_add_route (NMSettingIPConfig *s_ip,
|
|||
|
||||
g_assert (s_ip);
|
||||
|
||||
if (nm_utils_ipaddr_valid (AF_INET, dest))
|
||||
if (nm_utils_ipaddr_is_valid (AF_INET, dest))
|
||||
family = AF_INET;
|
||||
else if (nm_utils_ipaddr_valid (AF_INET6, dest))
|
||||
else if (nm_utils_ipaddr_is_valid (AF_INET6, dest))
|
||||
family = AF_INET6;
|
||||
else
|
||||
g_assert_not_reached ();
|
||||
|
|
|
@ -1161,7 +1161,7 @@ _collect_resolv_conf_data (NMDnsManager *self,
|
|||
const char *hostdomain = strchr (priv->hostname, '.');
|
||||
|
||||
if ( hostdomain
|
||||
&& !nm_utils_ipaddr_valid (AF_UNSPEC, priv->hostname)) {
|
||||
&& !nm_utils_ipaddr_is_valid (AF_UNSPEC, priv->hostname)) {
|
||||
hostdomain++;
|
||||
if (domain_is_valid (hostdomain, TRUE))
|
||||
add_string_item (rc.searches, hostdomain, TRUE);
|
||||
|
|
|
@ -445,7 +445,7 @@ parse_ip (GHashTable *connections, const char *sysfs_dir, char *argument)
|
|||
if (gateway_ip && *gateway_ip) {
|
||||
int addr_family = guess_ip_address_family (gateway_ip);
|
||||
|
||||
if (nm_utils_ipaddr_valid (addr_family, gateway_ip)) {
|
||||
if (nm_utils_ipaddr_is_valid (addr_family, gateway_ip)) {
|
||||
switch (addr_family) {
|
||||
case AF_INET:
|
||||
g_object_set (s_ip4, NM_SETTING_IP_CONFIG_GATEWAY, gateway_ip, NULL);
|
||||
|
@ -470,7 +470,7 @@ parse_ip (GHashTable *connections, const char *sysfs_dir, char *argument)
|
|||
for (i = 0; i < 2; i++) {
|
||||
if (dns_addr_family[i] == AF_UNSPEC)
|
||||
break;
|
||||
if (nm_utils_ipaddr_valid (dns_addr_family[i], dns[i])) {
|
||||
if (nm_utils_ipaddr_is_valid (dns_addr_family[i], dns[i])) {
|
||||
switch (dns_addr_family[i]) {
|
||||
case AF_INET:
|
||||
nm_setting_ip_config_add_dns (s_ip4, dns[i]);
|
||||
|
|
|
@ -204,19 +204,19 @@ ip_setting_add_from_block (GHashTable *nic,
|
|||
NM_SETTING_IP_CONFIG_MAY_FAIL, FALSE,
|
||||
NULL);
|
||||
|
||||
if (s_gateway && !nm_utils_ipaddr_valid (family, s_gateway)) {
|
||||
if (s_gateway && !nm_utils_ipaddr_is_valid (family, s_gateway)) {
|
||||
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
|
||||
"iBFT: invalid IP gateway '%s'.", s_gateway);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (s_dns1 && !nm_utils_ipaddr_valid (family, s_dns1)) {
|
||||
if (s_dns1 && !nm_utils_ipaddr_is_valid (family, s_dns1)) {
|
||||
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
|
||||
"iBFT: invalid DNS1 address '%s'.", s_dns1);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (s_dns2 && !nm_utils_ipaddr_valid (family, s_dns2)) {
|
||||
if (s_dns2 && !nm_utils_ipaddr_is_valid (family, s_dns2)) {
|
||||
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
|
||||
"iBFT: invalid DNS2 address '%s'.", s_dns2);
|
||||
return FALSE;
|
||||
|
|
|
@ -1024,8 +1024,8 @@ load_global_dns (GKeyFile *keyfile, gboolean internal)
|
|||
if (strv) {
|
||||
_nm_utils_strv_cleanup (strv, TRUE, TRUE, TRUE);
|
||||
for (i = 0, j = 0; strv[i]; i++) {
|
||||
if ( nm_utils_ipaddr_valid (AF_INET, strv[i])
|
||||
|| nm_utils_ipaddr_valid (AF_INET6, strv[i]))
|
||||
if ( nm_utils_ipaddr_is_valid (AF_INET, strv[i])
|
||||
|| nm_utils_ipaddr_is_valid (AF_INET6, strv[i]))
|
||||
strv[j++] = strv[i];
|
||||
else
|
||||
g_free (strv[i]);
|
||||
|
@ -1147,8 +1147,8 @@ global_dns_domain_from_dbus (char *name, GVariant *variant)
|
|||
strv = g_variant_dup_strv (val, NULL);
|
||||
_nm_utils_strv_cleanup (strv, TRUE, TRUE, TRUE);
|
||||
for (i = 0, j = 0; strv && strv[i]; i++) {
|
||||
if ( nm_utils_ipaddr_valid (AF_INET, strv[i])
|
||||
|| nm_utils_ipaddr_valid (AF_INET6, strv[i]))
|
||||
if ( nm_utils_ipaddr_is_valid (AF_INET, strv[i])
|
||||
|| nm_utils_ipaddr_is_valid (AF_INET6, strv[i]))
|
||||
strv[j++] = strv[i];
|
||||
else
|
||||
g_free (strv[i]);
|
||||
|
|
|
@ -1813,10 +1813,10 @@ make_ip4_setting (shvarFile *ifcfg,
|
|||
nm_clear_g_free (&value);
|
||||
v = svGetValueStr (ifcfg, tag, &value);
|
||||
if (v) {
|
||||
if (nm_utils_ipaddr_valid (AF_INET, v)) {
|
||||
if (nm_utils_ipaddr_is_valid (AF_INET, v)) {
|
||||
if (!nm_setting_ip_config_add_dns (s_ip4, v))
|
||||
PARSE_WARNING ("duplicate DNS server %s", tag);
|
||||
} else if (nm_utils_ipaddr_valid (AF_INET6, v)) {
|
||||
} else if (nm_utils_ipaddr_is_valid (AF_INET6, v)) {
|
||||
/* Ignore IPv6 addresses */
|
||||
} else {
|
||||
PARSE_WARNING ("invalid DNS server address %s", v);
|
||||
|
@ -2256,7 +2256,7 @@ make_ip6_setting (shvarFile *ifcfg,
|
|||
char *ptr;
|
||||
if ((ptr = strchr (v, '%')) != NULL)
|
||||
*ptr = '\0'; /* remove %interface prefix if present */
|
||||
if (!nm_utils_ipaddr_valid (AF_INET6, v)) {
|
||||
if (!nm_utils_ipaddr_is_valid (AF_INET6, v)) {
|
||||
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
|
||||
"Invalid IP6 address '%s'", v);
|
||||
return NULL;
|
||||
|
@ -2295,10 +2295,10 @@ make_ip6_setting (shvarFile *ifcfg,
|
|||
break;
|
||||
}
|
||||
|
||||
if (nm_utils_ipaddr_valid (AF_INET6, v)) {
|
||||
if (nm_utils_ipaddr_is_valid (AF_INET6, v)) {
|
||||
if (!nm_setting_ip_config_add_dns (s_ip6, v))
|
||||
PARSE_WARNING ("duplicate DNS server %s", tag);
|
||||
} else if (nm_utils_ipaddr_valid (AF_INET, v)) {
|
||||
} else if (nm_utils_ipaddr_is_valid (AF_INET, v)) {
|
||||
/* Ignore IPv4 addresses */
|
||||
} else {
|
||||
PARSE_WARNING ("invalid DNS server address %s", v);
|
||||
|
|
|
@ -2094,7 +2094,7 @@ test_read_wired_aliases_good (gconstpointer test_data)
|
|||
g_assert (ip4_addr != NULL);
|
||||
|
||||
addr = nm_ip_address_get_address (ip4_addr);
|
||||
g_assert (nm_utils_ipaddr_valid (AF_INET, addr));
|
||||
g_assert (nm_utils_ipaddr_is_valid (AF_INET, addr));
|
||||
|
||||
for (j = 0; j < expected_num_addresses; j++) {
|
||||
if (!g_strcmp0 (addr, expected_address[j]))
|
||||
|
|
|
@ -484,7 +484,7 @@ update_ip4_setting_from_if_block (NMConnection *connection,
|
|||
/* gateway */
|
||||
gateway_v = ifparser_getkey (block, "gateway");
|
||||
if (gateway_v) {
|
||||
if (!nm_utils_ipaddr_valid (AF_INET, gateway_v)) {
|
||||
if (!nm_utils_ipaddr_is_valid (AF_INET, gateway_v)) {
|
||||
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
|
||||
"Invalid IPv4 gateway '%s'", gateway_v);
|
||||
return FALSE;
|
||||
|
@ -596,7 +596,7 @@ update_ip6_setting_from_if_block (NMConnection *connection,
|
|||
/* gateway */
|
||||
gateway_v = ifparser_getkey (block, "gateway");
|
||||
if (gateway_v) {
|
||||
if (!nm_utils_ipaddr_valid (AF_INET6, gateway_v)) {
|
||||
if (!nm_utils_ipaddr_is_valid (AF_INET6, gateway_v)) {
|
||||
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
|
||||
"Invalid IPv6 gateway '%s'", gateway_v);
|
||||
return FALSE;
|
||||
|
|
Loading…
Reference in a new issue