fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-17 12:50:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

all: use nm_utils_ifname_valid_kernel() instead of nm_utils_is_valid_iface_name()

Browse source 
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)

(cherry picked from commit 6e9a36ab9f)
This commit is contained in:
Antonio Cardace 2020-02-12 18:01:13 +01:00
parent 2cf568bd8f
commit c3b0f1d4f5
18 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/common/nm-vpn-helpers.c
View file

@ -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;
}
}

6
clients/tui/nmt-device-entry.c
View file

@ -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;

4
libnm-core/nm-setting-bond.c
View file

@ -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);
}
/**
@ -611,7 +611,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,

2
libnm-core/nm-setting-connection.c
View file

@ -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),

4
libnm-core/nm-setting-infiniband.c
View file

@ -177,7 +177,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,
@ -214,7 +214,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.

2
libnm-core/nm-setting-ip-config.c
View file

@ -4921,7 +4921,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;
}

2
libnm-core/nm-setting-ip-tunnel.c
View file

@ -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,

2
libnm-core/nm-setting-macvlan.c
View file

@ -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,

2
libnm-core/nm-setting-pppoe.c
View file

@ -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,

2
libnm-core/nm-setting-vlan.c
View file

@ -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,

2
libnm-core/nm-setting-vxlan.c
View file

@ -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,

2
libnm-core/nm-utils.c
View file

@ -4696,7 +4696,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);
}
/**

2
src/dhcp/nm-dhcp-client.c
View file

@ -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 */

2
src/nm-config.c
View file

@ -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);

8
src/nm-core-utils.c
View file

@ -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;
}
@ -3635,7 +3635,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. */

4
src/platform/nm-platform-utils.c
View file

@ -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));
@ -1416,7 +1416,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);

22
src/platform/tests/test-common.c
View file

@ -1175,7 +1175,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);
@ -1204,7 +1204,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);
@ -1235,7 +1235,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;
@ -1287,7 +1287,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);
@ -1348,7 +1348,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);
@ -1397,7 +1397,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);
@ -1438,7 +1438,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);
@ -1486,7 +1486,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);
@ -1532,7 +1532,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);
@ -1595,7 +1595,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);
@ -1684,7 +1684,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);

2
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View file

@ -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);