mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-21 02:04:17 +00:00
all: use nm_utils_ifname_valid_kernel() instead of nm_utils_is_valid_iface_name()
nm_utils_is_valid_iface_name() is a public API of libnm-core, let's use our internal API. $ sed -i 's/\<nm_utils_is_valid_iface_name\>/nm_utils_ifname_valid_kernel/g' $(git grep -l nm_utils_is_valid_iface_name)
This commit is contained in:
parent
550f538564
commit
6e9a36ab9f
|
@ -368,7 +368,7 @@ nm_vpn_wireguard_import (const char *filename,
|
|||
memcpy (ifname, cstr, len);
|
||||
ifname[len] = '\0';
|
||||
|
||||
if (nm_utils_is_valid_iface_name (ifname, NULL))
|
||||
if (nm_utils_ifname_valid_kernel (ifname, NULL))
|
||||
ifname_valid = TRUE;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -103,7 +103,7 @@ device_entry_parse (NmtDeviceEntry *deventry,
|
|||
return TRUE;
|
||||
|
||||
if (priv->hardware_type == G_TYPE_NONE && !priv->device_filter) {
|
||||
if (nm_utils_is_valid_iface_name (text, NULL)) {
|
||||
if (nm_utils_ifname_valid_kernel (text, NULL)) {
|
||||
*interface_name = g_strdup (text);
|
||||
return TRUE;
|
||||
} else
|
||||
|
@ -127,12 +127,12 @@ device_entry_parse (NmtDeviceEntry *deventry,
|
|||
|
||||
len = nm_utils_hwaddr_len (priv->arptype);
|
||||
if ( nm_utils_hwaddr_aton (words[0], buf, len)
|
||||
&& (!words[1] || nm_utils_is_valid_iface_name (words[1], NULL))) {
|
||||
&& (!words[1] || nm_utils_ifname_valid_kernel (words[1], NULL))) {
|
||||
*mac_address = words[0];
|
||||
*interface_name = NULL;
|
||||
g_free (words);
|
||||
return TRUE;
|
||||
} else if ( nm_utils_is_valid_iface_name (words[0], NULL)
|
||||
} else if ( nm_utils_ifname_valid_kernel (words[0], NULL)
|
||||
&& (!words[1] || nm_utils_hwaddr_aton (words[1], buf, len))) {
|
||||
*interface_name = words[0];
|
||||
*mac_address = NULL;
|
||||
|
|
|
@ -225,7 +225,7 @@ validate_ifname (const char *name, const char *value)
|
|||
if (!value || !value[0])
|
||||
return FALSE;
|
||||
|
||||
return nm_utils_is_valid_iface_name (value, NULL);
|
||||
return nm_utils_ifname_valid_kernel (value, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -602,7 +602,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|||
if (strcmp (mode_new, "active-backup") == 0) {
|
||||
GError *tmp_error = NULL;
|
||||
|
||||
if (primary && !nm_utils_is_valid_iface_name (primary, &tmp_error)) {
|
||||
if (primary && !nm_utils_ifname_valid_kernel (primary, &tmp_error)) {
|
||||
g_set_error (error,
|
||||
NM_CONNECTION_ERROR,
|
||||
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
||||
|
|
|
@ -1276,7 +1276,7 @@ nm_setting_connection_set_interface_name (NMSetting *setting,
|
|||
* overridden by a valid connection.interface-name.
|
||||
*/
|
||||
interface_name = find_virtual_interface_name (connection_dict);
|
||||
if (!interface_name || nm_utils_is_valid_iface_name (interface_name, NULL))
|
||||
if (!interface_name || nm_utils_ifname_valid_kernel (interface_name, NULL))
|
||||
interface_name = g_variant_get_string (value, NULL);
|
||||
|
||||
g_object_set (G_OBJECT (setting),
|
||||
|
|
|
@ -178,7 +178,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|||
if (priv->parent) {
|
||||
GError *tmp_error = NULL;
|
||||
|
||||
if (!nm_utils_is_valid_iface_name (priv->parent, &tmp_error)) {
|
||||
if (!nm_utils_ifname_valid_kernel (priv->parent, &tmp_error)) {
|
||||
g_set_error (error,
|
||||
NM_CONNECTION_ERROR,
|
||||
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
||||
|
@ -215,7 +215,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|||
|
||||
if (!interface_name)
|
||||
;
|
||||
else if (!nm_utils_is_valid_iface_name (interface_name, &tmp_error)) {
|
||||
else if (!nm_utils_ifname_valid_kernel (interface_name, &tmp_error)) {
|
||||
/* report the error for NMSettingConnection:interface-name, because
|
||||
* it's that property that is invalid -- although we currently verify()
|
||||
* NMSettingInfiniband.
|
||||
|
|
|
@ -4908,7 +4908,7 @@ verify_label (const char *label)
|
|||
if (!p)
|
||||
return FALSE;
|
||||
iface = g_strndup (label, p - label);
|
||||
if (!nm_utils_is_valid_iface_name (iface, NULL)) {
|
||||
if (!nm_utils_ifname_valid_kernel (iface, NULL)) {
|
||||
g_free (iface);
|
||||
return FALSE;
|
||||
}
|
||||
|
|
|
@ -329,7 +329,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|||
}
|
||||
|
||||
if ( priv->parent
|
||||
&& !nm_utils_is_valid_iface_name (priv->parent, NULL)
|
||||
&& !nm_utils_ifname_valid_kernel (priv->parent, NULL)
|
||||
&& !nm_utils_is_uuid (priv->parent)) {
|
||||
g_set_error (error,
|
||||
NM_CONNECTION_ERROR,
|
||||
|
|
|
@ -120,7 +120,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|||
|
||||
if (priv->parent) {
|
||||
if ( !nm_utils_is_uuid (priv->parent)
|
||||
&& !nm_utils_is_valid_iface_name (priv->parent, NULL)) {
|
||||
&& !nm_utils_ifname_valid_kernel (priv->parent, NULL)) {
|
||||
g_set_error (error,
|
||||
NM_CONNECTION_ERROR,
|
||||
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
||||
|
|
|
@ -149,7 +149,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|||
}
|
||||
|
||||
if ( priv->parent
|
||||
&& !nm_utils_is_valid_iface_name (priv->parent, &local_error)) {
|
||||
&& !nm_utils_ifname_valid_kernel (priv->parent, &local_error)) {
|
||||
g_set_error (error,
|
||||
NM_CONNECTION_ERROR,
|
||||
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
||||
|
|
|
@ -603,7 +603,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|||
return FALSE;
|
||||
}
|
||||
}
|
||||
} else if (!nm_utils_is_valid_iface_name (priv->parent, NULL)) {
|
||||
} else if (!nm_utils_ifname_valid_kernel (priv->parent, NULL)) {
|
||||
/* parent must be either a UUID or an interface name */
|
||||
g_set_error (error,
|
||||
NM_CONNECTION_ERROR,
|
||||
|
|
|
@ -358,7 +358,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|||
}
|
||||
|
||||
if ( priv->parent
|
||||
&& !nm_utils_is_valid_iface_name (priv->parent, NULL)
|
||||
&& !nm_utils_ifname_valid_kernel (priv->parent, NULL)
|
||||
&& !nm_utils_is_uuid (priv->parent)) {
|
||||
g_set_error (error,
|
||||
NM_CONNECTION_ERROR,
|
||||
|
|
|
@ -4697,7 +4697,7 @@ nm_utils_is_valid_iface_name_utf8safe (const char *utf8safe_name)
|
|||
}
|
||||
}
|
||||
|
||||
return nm_utils_is_valid_iface_name (bin, NULL);
|
||||
return nm_utils_ifname_valid_kernel (bin, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -1011,7 +1011,7 @@ set_property (GObject *object, guint prop_id,
|
|||
/* construct-only */
|
||||
priv->iface = g_value_dup_string (value);
|
||||
g_return_if_fail (priv->iface);
|
||||
nm_assert (nm_utils_is_valid_iface_name (priv->iface, NULL));
|
||||
nm_assert (nm_utils_ifname_valid_kernel (priv->iface, NULL));
|
||||
break;
|
||||
case PROP_IFINDEX:
|
||||
/* construct-only */
|
||||
|
|
|
@ -430,7 +430,7 @@ nm_config_set_no_auto_default_for_device (NMConfig *self, NMDevice *device)
|
|||
*
|
||||
* Instead, try the interface-name... */
|
||||
ifname = nm_device_get_ip_iface (device);
|
||||
if (!nm_utils_is_valid_iface_name (ifname, NULL))
|
||||
if (!nm_utils_ifname_valid_kernel (ifname, NULL))
|
||||
return;
|
||||
|
||||
spec_to_free = g_strdup_printf (NM_MATCH_SPEC_INTERFACE_NAME_TAG"=%s", ifname);
|
||||
|
|
|
@ -2145,7 +2145,7 @@ nm_utils_sysctl_ip_conf_path (int addr_family, char *buf, const char *ifname, co
|
|||
nm_assert (buf);
|
||||
nm_assert_addr_family (addr_family);
|
||||
|
||||
g_assert (nm_utils_is_valid_iface_name (ifname, NULL));
|
||||
g_assert (nm_utils_ifname_valid_kernel (ifname, NULL));
|
||||
property = NM_ASSERT_VALID_PATH_COMPONENT (property);
|
||||
|
||||
len = g_snprintf (buf,
|
||||
|
@ -2163,7 +2163,7 @@ nm_utils_sysctl_ip_conf_is_path (int addr_family, const char *path, const char *
|
|||
{
|
||||
g_return_val_if_fail (path, FALSE);
|
||||
NM_ASSERT_VALID_PATH_COMPONENT (property);
|
||||
g_assert (!ifname || nm_utils_is_valid_iface_name (ifname, NULL));
|
||||
g_assert (!ifname || nm_utils_ifname_valid_kernel (ifname, NULL));
|
||||
|
||||
if (addr_family == AF_INET) {
|
||||
if (!g_str_has_prefix (path, IPV4_PROPERTY_DIR))
|
||||
|
@ -2196,7 +2196,7 @@ nm_utils_sysctl_ip_conf_is_path (int addr_family, const char *path, const char *
|
|||
return FALSE;
|
||||
memcpy (buf, path, l);
|
||||
buf[l] = '\0';
|
||||
if (!nm_utils_is_valid_iface_name (buf, NULL))
|
||||
if (!nm_utils_ifname_valid_kernel (buf, NULL))
|
||||
return FALSE;
|
||||
path = slash + 1;
|
||||
}
|
||||
|
@ -3637,7 +3637,7 @@ nm_utils_ifname_cpy (char *dst, const char *name)
|
|||
g_return_if_fail (dst);
|
||||
g_return_if_fail (name && name[0]);
|
||||
|
||||
nm_assert (nm_utils_is_valid_iface_name (name, NULL));
|
||||
nm_assert (nm_utils_ifname_valid_kernel (name, NULL));
|
||||
|
||||
/* ensures NUL padding of the entire IFNAMSIZ buffer. */
|
||||
|
||||
|
|
|
@ -155,7 +155,7 @@ again:
|
|||
const char *ifname = known_ifnames[try_count % 2];
|
||||
|
||||
nm_assert (ifindex > 0);
|
||||
nm_assert (ifname && nm_utils_is_valid_iface_name (ifname, NULL));
|
||||
nm_assert (ifname && nm_utils_ifname_valid_kernel (ifname, NULL));
|
||||
nm_assert (fd >= 0);
|
||||
|
||||
memset (&ifr, 0, sizeof (ifr));
|
||||
|
@ -1417,7 +1417,7 @@ nmp_utils_sysctl_open_netdir (int ifindex,
|
|||
return -1;
|
||||
}
|
||||
|
||||
nm_assert (nm_utils_is_valid_iface_name (ifname, NULL));
|
||||
nm_assert (nm_utils_ifname_valid_kernel (ifname, NULL));
|
||||
|
||||
if (g_strlcpy (&sysdir[NM_STRLEN (SYS_CLASS_NET)], ifname, IFNAMSIZ) >= IFNAMSIZ)
|
||||
g_return_val_if_reached (-1);
|
||||
|
|
|
@ -1176,7 +1176,7 @@ nmtstp_link_veth_add (NMPlatform *platform,
|
|||
const NMPlatformLink *pllink = NULL;
|
||||
gboolean success;
|
||||
|
||||
g_assert (nm_utils_is_valid_iface_name (name, NULL));
|
||||
g_assert (nm_utils_ifname_valid_kernel (name, NULL));
|
||||
|
||||
external_command = nmtstp_run_command_check_external (external_command);
|
||||
|
||||
|
@ -1205,7 +1205,7 @@ nmtstp_link_dummy_add (NMPlatform *platform,
|
|||
const NMPlatformLink *pllink = NULL;
|
||||
gboolean success;
|
||||
|
||||
g_assert (nm_utils_is_valid_iface_name (name, NULL));
|
||||
g_assert (nm_utils_ifname_valid_kernel (name, NULL));
|
||||
|
||||
external_command = nmtstp_run_command_check_external (external_command);
|
||||
|
||||
|
@ -1236,7 +1236,7 @@ nmtstp_link_gre_add (NMPlatform *platform,
|
|||
char b2[INET_ADDRSTRLEN];
|
||||
NMLinkType link_type;
|
||||
|
||||
g_assert (nm_utils_is_valid_iface_name (name, NULL));
|
||||
g_assert (nm_utils_ifname_valid_kernel (name, NULL));
|
||||
|
||||
external_command = nmtstp_run_command_check_external (external_command);
|
||||
link_type = lnk->is_tap ? NM_LINK_TYPE_GRETAP : NM_LINK_TYPE_GRE;
|
||||
|
@ -1288,7 +1288,7 @@ nmtstp_link_ip6tnl_add (NMPlatform *platform,
|
|||
gboolean encap_ignore;
|
||||
gboolean tclass_inherit;
|
||||
|
||||
g_assert (nm_utils_is_valid_iface_name (name, NULL));
|
||||
g_assert (nm_utils_ifname_valid_kernel (name, NULL));
|
||||
g_assert (!lnk->is_gre);
|
||||
|
||||
external_command = nmtstp_run_command_check_external (external_command);
|
||||
|
@ -1349,7 +1349,7 @@ nmtstp_link_ip6gre_add (NMPlatform *platform,
|
|||
char tclass[20];
|
||||
gboolean tclass_inherit;
|
||||
|
||||
g_assert (nm_utils_is_valid_iface_name (name, NULL));
|
||||
g_assert (nm_utils_ifname_valid_kernel (name, NULL));
|
||||
g_assert (lnk->is_gre);
|
||||
|
||||
external_command = nmtstp_run_command_check_external (external_command);
|
||||
|
@ -1398,7 +1398,7 @@ nmtstp_link_ipip_add (NMPlatform *platform,
|
|||
char b1[INET_ADDRSTRLEN];
|
||||
char b2[INET_ADDRSTRLEN];
|
||||
|
||||
g_assert (nm_utils_is_valid_iface_name (name, NULL));
|
||||
g_assert (nm_utils_ifname_valid_kernel (name, NULL));
|
||||
|
||||
external_command = nmtstp_run_command_check_external (external_command);
|
||||
|
||||
|
@ -1439,7 +1439,7 @@ nmtstp_link_macvlan_add (NMPlatform *platform,
|
|||
gboolean success;
|
||||
NMLinkType link_type;
|
||||
|
||||
g_assert (nm_utils_is_valid_iface_name (name, NULL));
|
||||
g_assert (nm_utils_ifname_valid_kernel (name, NULL));
|
||||
|
||||
external_command = nmtstp_run_command_check_external (external_command);
|
||||
|
||||
|
@ -1487,7 +1487,7 @@ nmtstp_link_sit_add (NMPlatform *platform,
|
|||
char b1[INET_ADDRSTRLEN];
|
||||
char b2[INET_ADDRSTRLEN];
|
||||
|
||||
g_assert (nm_utils_is_valid_iface_name (name, NULL));
|
||||
g_assert (nm_utils_ifname_valid_kernel (name, NULL));
|
||||
|
||||
external_command = nmtstp_run_command_check_external (external_command);
|
||||
|
||||
|
@ -1533,7 +1533,7 @@ nmtstp_link_tun_add (NMPlatform *platform,
|
|||
int err;
|
||||
int r;
|
||||
|
||||
g_assert (nm_utils_is_valid_iface_name (name, NULL));
|
||||
g_assert (nm_utils_ifname_valid_kernel (name, NULL));
|
||||
g_assert (lnk);
|
||||
g_assert (NM_IN_SET (lnk->type, IFF_TUN, IFF_TAP));
|
||||
g_assert (!out_fd || *out_fd == -1);
|
||||
|
@ -1596,7 +1596,7 @@ nmtstp_link_vrf_add (NMPlatform *platform,
|
|||
const NMPlatformLink *pllink = NULL;
|
||||
int r = 0;
|
||||
|
||||
g_assert (nm_utils_is_valid_iface_name (name, NULL));
|
||||
g_assert (nm_utils_ifname_valid_kernel (name, NULL));
|
||||
|
||||
NM_SET_OUT (out_not_supported, FALSE);
|
||||
external_command = nmtstp_run_command_check_external (external_command);
|
||||
|
@ -1635,7 +1635,7 @@ nmtstp_link_vxlan_add (NMPlatform *platform,
|
|||
int err;
|
||||
int r;
|
||||
|
||||
g_assert (nm_utils_is_valid_iface_name (name, NULL));
|
||||
g_assert (nm_utils_ifname_valid_kernel (name, NULL));
|
||||
|
||||
external_command = nmtstp_run_command_check_external (external_command);
|
||||
|
||||
|
@ -1724,7 +1724,7 @@ nmtstp_link_get_typed (NMPlatform *platform,
|
|||
g_assert_cmpstr (name, ==, pllink->name);
|
||||
}
|
||||
|
||||
g_assert (!name || nm_utils_is_valid_iface_name (name, NULL));
|
||||
g_assert (!name || nm_utils_ifname_valid_kernel (name, NULL));
|
||||
|
||||
if (pllink && link_type != NM_LINK_TYPE_NONE)
|
||||
g_assert_cmpint (pllink->type, ==, link_type);
|
||||
|
|
|
@ -399,7 +399,7 @@ make_connection_setting (const char *file,
|
|||
if (v) {
|
||||
GError *error = NULL;
|
||||
|
||||
if (nm_utils_is_valid_iface_name (v, &error)) {
|
||||
if (nm_utils_ifname_valid_kernel (v, &error)) {
|
||||
g_object_set (s_con,
|
||||
NM_SETTING_CONNECTION_INTERFACE_NAME, v,
|
||||
NULL);
|
||||
|
|
Loading…
Reference in a new issue