From 80817ec8c483ae9b0f054ce5ae64593c67ced6f8 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sat, 6 Oct 2007 02:33:17 +0000 Subject: [PATCH] 2007-10-05 Dan Williams * libnm-util/nm-setting.c - (setting_wireless_verify, setting_wireless_destroy): add seen_bssids to the NMSettingWireless table; it's now a string array not an array of byte arrays git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2938 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++++ libnm-util/nm-setting.c | 10 ++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d30b36d4ad..3489114a64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-10-05 Dan Williams + + * libnm-util/nm-setting.c + - (setting_wireless_verify, setting_wireless_destroy): add seen_bssids + to the NMSettingWireless table; it's now a string array not an array + of byte arrays + 2007-10-05 Dan Williams * libnm-glib/nm-device-802-11-wireless.c diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c index 73532dc686..5f0dbbf4cc 100644 --- a/libnm-util/nm-setting.c +++ b/libnm-util/nm-setting.c @@ -4,6 +4,7 @@ #include #include #include +#include #include "nm-setting.h" #include "nm-utils.h" @@ -742,8 +743,9 @@ setting_wireless_verify (NMSetting *setting, GHashTable *all_settings) } for (iter = self->seen_bssids; iter; iter = iter->next) { - GByteArray *bssid = (GByteArray *) iter->data; - if (bssid->len != 6) { + struct ether_addr addr; + + if (!ether_aton_r (iter->data, &addr)) { g_warning ("Invalid bssid"); return FALSE; } @@ -775,8 +777,7 @@ setting_wireless_destroy (NMSetting *setting) g_byte_array_free (self->mac_address, TRUE); if (self->seen_bssids) { - for (iter = self->seen_bssids; iter; iter = iter->next) - g_byte_array_free ((GByteArray *) iter->data, TRUE); + g_slist_foreach (self->seen_bssids, (GFunc) g_free, NULL); g_slist_free (self->seen_bssids); } @@ -794,6 +795,7 @@ static SettingMember wireless_table[] = { { "tx-power", NM_S_TYPE_UINT32, G_STRUCT_OFFSET (NMSettingWireless, tx_power), FALSE, FALSE }, { "mac-address", NM_S_TYPE_BYTE_ARRAY, G_STRUCT_OFFSET (NMSettingWireless, mac_address), FALSE, FALSE }, { "mtu", NM_S_TYPE_UINT32, G_STRUCT_OFFSET (NMSettingWireless, mtu), FALSE, FALSE }, + { "seen-bssids", NM_S_TYPE_STRING_ARRAY, G_STRUCT_OFFSET (NMSettingWireless, seen_bssids), FALSE, FALSE }, { "security", NM_S_TYPE_STRING, G_STRUCT_OFFSET (NMSettingWireless, security), FALSE, FALSE }, { NULL, 0, 0 }, };