fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 09:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/trivial: rename nm_utils_detect_arp_type_from_addrlen() to nm_utils_arp_type_detect_from_hwaddrlen()

Browse source 
Rename the function so that the function name's prefix is
the topic what this is about: arp-type.
This commit is contained in:
Thomas Haller 2018-12-20 08:50:07 +01:00
parent 6f0cb0bf4f
commit 3bce451c60
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/devices/nm-device.c
View file

@ -7547,7 +7547,7 @@ dhcp4_get_client_id (NMDevice *self,
} }
hwaddr_bin = g_bytes_get_data (hwaddr, &hwaddr_len); hwaddr_bin = g_bytes_get_data (hwaddr, &hwaddr_len);
arp_type = nm_utils_detect_arp_type_from_addrlen (hwaddr_len); arp_type = nm_utils_arp_type_detect_from_hwaddrlen (hwaddr_len);
if (arp_type < 0) { if (arp_type < 0) {
fail_reason = "unsupported link-layer address"; fail_reason = "unsupported link-layer address";
goto out_fail; goto out_fail;
@ -7569,7 +7569,7 @@ dhcp4_get_client_id (NMDevice *self,
if (!_nm_utils_hwaddr_aton (hwaddr_str, hwaddr_bin_buf, sizeof (hwaddr_bin_buf), &hwaddr_len)) if (!_nm_utils_hwaddr_aton (hwaddr_str, hwaddr_bin_buf, sizeof (hwaddr_bin_buf), &hwaddr_len))
g_return_val_if_reached (NULL); g_return_val_if_reached (NULL);
arp_type = nm_utils_detect_arp_type_from_addrlen (hwaddr_len); arp_type = nm_utils_arp_type_detect_from_hwaddrlen (hwaddr_len);
if (arp_type < 0) { if (arp_type < 0) {
fail_reason = "unsupported permanent link-layer address"; fail_reason = "unsupported permanent link-layer address";
goto out_fail; goto out_fail;
@ -8376,7 +8376,7 @@ dhcp6_get_duid (NMDevice *self, NMConnection *connection, GBytes *hwaddr, gboole
} }
hwaddr_bin = g_bytes_get_data (hwaddr, &hwaddr_len); hwaddr_bin = g_bytes_get_data (hwaddr, &hwaddr_len);
arp_type = nm_utils_detect_arp_type_from_addrlen (hwaddr_len); arp_type = nm_utils_arp_type_detect_from_hwaddrlen (hwaddr_len);
if (arp_type < 0) { if (arp_type < 0) {
duid_error = "unsupported link-layer address"; duid_error = "unsupported link-layer address";
goto out_fail; goto out_fail;
@ -8434,7 +8434,7 @@ dhcp6_get_duid (NMDevice *self, NMConnection *connection, GBytes *hwaddr, gboole
duid_error = "missing link-layer address"; duid_error = "missing link-layer address";
goto out_fail; goto out_fail;
} }
if ((arp_type = nm_utils_detect_arp_type_from_addrlen (g_bytes_get_size (hwaddr))) < 0) { if ((arp_type = nm_utils_arp_type_detect_from_hwaddrlen (g_bytes_get_size (hwaddr))) < 0) {
duid_error = "unsupported link-layer address"; duid_error = "unsupported link-layer address";
goto out_fail; goto out_fail;
} }

4
src/dhcp/nm-dhcp-systemd.c
View file

@ -681,7 +681,7 @@ ip4_start (NMDhcpClient *client,
hwaddr = nm_dhcp_client_get_hw_addr (client); hwaddr = nm_dhcp_client_get_hw_addr (client);
if ( !hwaddr if ( !hwaddr
|| !(hwaddr_arr = g_bytes_get_data (hwaddr, &hwaddr_len)) || !(hwaddr_arr = g_bytes_get_data (hwaddr, &hwaddr_len))
|| (arp_type = nm_utils_detect_arp_type_from_addrlen (hwaddr_len)) < 0) { || (arp_type = nm_utils_arp_type_detect_from_hwaddrlen (hwaddr_len)) < 0) {
nm_utils_error_set_literal (error, NM_UTILS_ERROR_UNKNOWN, "invalid MAC address"); nm_utils_error_set_literal (error, NM_UTILS_ERROR_UNKNOWN, "invalid MAC address");
return FALSE; return FALSE;
} }
@ -1034,7 +1034,7 @@ ip6_start (NMDhcpClient *client,
hwaddr = nm_dhcp_client_get_hw_addr (client); hwaddr = nm_dhcp_client_get_hw_addr (client);
if ( !hwaddr if ( !hwaddr
|| !(hwaddr_arr = g_bytes_get_data (hwaddr, &hwaddr_len)) || !(hwaddr_arr = g_bytes_get_data (hwaddr, &hwaddr_len))
|| (arp_type = nm_utils_detect_arp_type_from_addrlen (hwaddr_len)) < 0) { || (arp_type = nm_utils_arp_type_detect_from_hwaddrlen (hwaddr_len)) < 0) {
nm_utils_error_set_literal (error, NM_UTILS_ERROR_UNKNOWN, "invalid MAC address"); nm_utils_error_set_literal (error, NM_UTILS_ERROR_UNKNOWN, "invalid MAC address");
return FALSE; return FALSE;
} }

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

@ -2841,7 +2841,7 @@ nm_utils_boot_id_bin (void)
/*****************************************************************************/ /*****************************************************************************/
/** /**
* nm_utils_detect_arp_type_from_addrlen: * nm_utils_arp_type_detect_from_hwaddrlen:
* @hwaddr_len: the length of the hardware address in bytes. * @hwaddr_len: the length of the hardware address in bytes.
* *
* Detects the arp-type based on the length of the MAC address. * Detects the arp-type based on the length of the MAC address.
@ -2852,7 +2852,7 @@ nm_utils_boot_id_bin (void)
* *
* Returns: the arp-type or negative value on error. */ * Returns: the arp-type or negative value on error. */
int int
nm_utils_detect_arp_type_from_addrlen (gsize hwaddr_len) nm_utils_arp_type_detect_from_hwaddrlen (gsize hwaddr_len)
{ {
switch (hwaddr_len) { switch (hwaddr_len) {
case ETH_ALEN: case ETH_ALEN:

2
src/nm-core-utils.h
View file

@ -279,7 +279,7 @@ gboolean nm_utils_host_id_get (const guint8 **out_host_id,
gsize *out_host_id_len); gsize *out_host_id_len);
gint64 nm_utils_host_id_get_timestamp_ns (void); gint64 nm_utils_host_id_get_timestamp_ns (void);
int nm_utils_detect_arp_type_from_addrlen (gsize hwaddr_len); int nm_utils_arp_type_detect_from_hwaddrlen (gsize hwaddr_len);
/* IPv6 Interface Identifier helpers */ /* IPv6 Interface Identifier helpers */