fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-21 11:10:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: Use length-based hwaddr functions

Browse source 
Use nm_utils_hwaddr_aton_len() and nm_utils_hwaddr_ntoa_len(), to
simplify code, and (eventually) better support non-ethernet,
non-infiniband devices.
This commit is contained in:
Dan Winship 2013-06-05 17:41:11 -03:00
parent 82ac7da754
commit 6975645497
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/config/nm-config-device.c
View file

@ -76,5 +76,5 @@ nm_config_device_get_hwaddr (NMConfigDevice *self)
guint len = 0;
bytes = NM_CONFIG_DEVICE_GET_INTERFACE (self)->get_hw_address (self, &len);
return nm_utils_hwaddr_ntoa (bytes, nm_utils_hwaddr_type (len));
return nm_utils_hwaddr_ntoa_len (bytes, len);
}

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

@ -4706,7 +4706,6 @@ set_property (GObject *object, guint prop_id,
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (object);
NMPlatformLink *platform_device;
const char *hw_addr;
int hw_addr_type;
switch (prop_id) {
case PROP_PLATFORM_DEVICE:
@ -4791,10 +4790,8 @@ set_property (GObject *object, guint prop_id,
g_warn_if_fail (*hw_addr == '\0');
break;
}
hw_addr_type = nm_utils_hwaddr_type (priv->hw_addr_len);
g_return_if_fail (hw_addr_type != -1);
if (!nm_utils_hwaddr_aton (hw_addr, hw_addr_type, priv->hw_addr)) {
if (!nm_utils_hwaddr_aton_len (hw_addr, priv->hw_addr, priv->hw_addr_len)) {
g_warning ("Could not parse hw-address '%s'", hw_addr);
memset (priv->hw_addr, 0, sizeof (priv->hw_addr));
}
@ -4932,7 +4929,7 @@ get_property (GObject *object, guint prop_id,
break;
case PROP_HW_ADDRESS:
if (priv->hw_addr_len)
g_value_take_string (value, nm_utils_hwaddr_ntoa (priv->hw_addr, nm_utils_hwaddr_type (priv->hw_addr_len)));
g_value_take_string (value, nm_utils_hwaddr_ntoa_len (priv->hw_addr, priv->hw_addr_len));
else
g_value_set_string (value, NULL);
break;
@ -5862,7 +5859,7 @@ spec_match_list (NMDevice *device, const GSList *specs)
return TRUE;
if (priv->hw_addr_len) {
hwaddr_str = nm_utils_hwaddr_ntoa (priv->hw_addr, nm_utils_hwaddr_type (priv->hw_addr_len));
hwaddr_str = nm_utils_hwaddr_ntoa_len (priv->hw_addr, priv->hw_addr_len);
matched = nm_match_spec_hwaddr (specs, hwaddr_str);
g_free (hwaddr_str);
}
@ -6228,7 +6225,7 @@ nm_device_update_hw_address (NMDevice *dev)
} else {
changed = !!memcmp (priv->hw_addr, binaddr, addrlen);
if (changed) {
char *addrstr = nm_utils_hwaddr_ntoa (binaddr, nm_utils_hwaddr_type (addrlen));
char *addrstr = nm_utils_hwaddr_ntoa_len (binaddr, priv->hw_addr_len);
memcpy (priv->hw_addr, binaddr, addrlen);
nm_log_dbg (LOGD_HW | LOGD_DEVICE,