colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm-util: add ether_ntoa/ether_aton-like utility methods

Browse Source 
nm_utils_hwaddr_ntoa() and nm_utils_hwaddr_aton() are like
ether_ntoa()/ether_aton(), but handle IPoIB too.

nm_utils_hwaddr_atoba() is like _aton() but returns a GByteArray,
since that's what's wanted in many places.

Also remove nm_ether_ntop() and replace uses of it with
nm_utils_hwaddr_ntoa().
This commit is contained in:
Dan Winship
2011-10-10 16:00:28 -04:00
committed by Dan Williams
parent 3dcfd305d6
commit 2510c617ec
15 changed files with 162 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/settings/plugins/ifnet/connection_parser.c
View File

@@ -509,20 +509,17 @@ static gboolean
read_mac_address (const char *conn_name, GByteArray **array, GError **error)
{
const char *value = ifnet_get_data (conn_name, "mac");
struct ether_addr *mac;
if (!value || !strlen (value))
return TRUE;
mac = ether_aton (value);
if (!mac) {
*array = nm_utils_hwaddr_atoba (value, ARPHRD_ETHER);
if (!*array) {
g_set_error (error, ifnet_plugin_error_quark (), 0,
"The MAC address '%s' was invalid.", value);
"The MAC address '%s' was invalid.", value);
return FALSE;
}
*array = g_byte_array_sized_new (ETH_ALEN);
g_byte_array_append (*array, (guint8 *) mac->ether_addr_octet, ETH_ALEN);
return TRUE;
}
@@ -1012,18 +1009,15 @@ make_wireless_connection_setting (const char *conn_name,
/* BSSID setting */
value = wpa_get_value (conn_name, "bssid");
if (value) {
struct ether_addr *eth;
GByteArray *bssid;
eth = ether_aton (value);
if (!eth) {
bssid = nm_utils_hwaddr_atoba (value, ARPHRD_ETHER);
if (!bssid) {
g_set_error (error, ifnet_plugin_error_quark (), 0,
"Invalid BSSID '%s'", value);
"Invalid BSSID '%s'", value);
goto error;
}
bssid = g_byte_array_sized_new (ETH_ALEN);
g_byte_array_append (bssid, eth->ether_addr_octet, ETH_ALEN);
g_object_set (wireless_setting, NM_SETTING_WIRELESS_BSSID,
bssid, NULL);
g_byte_array_free (bssid, TRUE);