mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-05 06:28:05 +02:00
libnm: track wifi.seen-bssids in a GPtrArray instead of a GSList
GPtrArray allows direct lookup by index. Since the NMSettingWireless API is based on lookup by index, this is a common operation. Note that nm_setting_wireless_add_seen_bssid() is still O(n), meaning to add n elements, it takes O(n^2). That's not great but no worse than before. The cases where GSList is the best choice for a data type are few.
This commit is contained in:
Thomas Haller
parent
b4fe51b5fa
commit
4d03b16f9d
1 changed files with 71 additions and 41 deletions
|
|
@ -71,8 +71,8 @@ typedef struct {
|
|||
char *cloned_mac_address;
|
||||
char *generate_mac_address_mask;
|
||||
GArray *mac_address_blacklist;
|
||||
GPtrArray *seen_bssids;
|
||||
guint32 mtu;
|
||||
GSList *seen_bssids;
|
||||
gboolean hidden;
|
||||
guint32 powersave;
|
||||
NMSettingMacRandomization mac_address_randomization;
|
||||
|
|
@ -658,33 +658,27 @@ nm_setting_wireless_add_seen_bssid (NMSettingWireless *setting,
|
|||
const char *bssid)
|
||||
{
|
||||
NMSettingWirelessPrivate *priv;
|
||||
char *lower_bssid;
|
||||
GSList *iter;
|
||||
gboolean found = FALSE;
|
||||
gs_free char *lower_bssid = NULL;
|
||||
|
||||
g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), FALSE);
|
||||
g_return_val_if_fail (bssid != NULL, FALSE);
|
||||
|
||||
lower_bssid = g_ascii_strdown (bssid, -1);
|
||||
if (!lower_bssid)
|
||||
return FALSE;
|
||||
|
||||
priv = NM_SETTING_WIRELESS_GET_PRIVATE (setting);
|
||||
|
||||
for (iter = priv->seen_bssids; iter; iter = iter->next) {
|
||||
if (!strcmp ((char *) iter->data, lower_bssid)) {
|
||||
found = TRUE;
|
||||
break;
|
||||
}
|
||||
lower_bssid = g_ascii_strdown (bssid, -1);
|
||||
|
||||
if (!priv->seen_bssids) {
|
||||
priv->seen_bssids = g_ptr_array_new_with_free_func (g_free);
|
||||
} else {
|
||||
if (nm_utils_strv_find_first ((char **) priv->seen_bssids->pdata,
|
||||
priv->seen_bssids->len,
|
||||
lower_bssid) >= 0)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (!found) {
|
||||
priv->seen_bssids = g_slist_prepend (priv->seen_bssids, lower_bssid);
|
||||
_notify (setting, PROP_SEEN_BSSIDS);
|
||||
} else
|
||||
g_free (lower_bssid);
|
||||
|
||||
return !found;
|
||||
g_ptr_array_add (priv->seen_bssids, g_steal_pointer (&lower_bssid));
|
||||
_notify (setting, PROP_SEEN_BSSIDS);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -696,9 +690,15 @@ nm_setting_wireless_add_seen_bssid (NMSettingWireless *setting,
|
|||
guint32
|
||||
nm_setting_wireless_get_num_seen_bssids (NMSettingWireless *setting)
|
||||
{
|
||||
NMSettingWirelessPrivate *priv;
|
||||
|
||||
g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), 0);
|
||||
|
||||
return g_slist_length (NM_SETTING_WIRELESS_GET_PRIVATE (setting)->seen_bssids);
|
||||
priv = NM_SETTING_WIRELESS_GET_PRIVATE (setting);
|
||||
|
||||
return priv->seen_bssids
|
||||
? priv->seen_bssids->len
|
||||
: 0u;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -712,9 +712,17 @@ const char *
|
|||
nm_setting_wireless_get_seen_bssid (NMSettingWireless *setting,
|
||||
guint32 i)
|
||||
{
|
||||
g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), NULL);
|
||||
NMSettingWirelessPrivate *priv;
|
||||
|
||||
return (const char *) g_slist_nth_data (NM_SETTING_WIRELESS_GET_PRIVATE (setting)->seen_bssids, i);
|
||||
g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), 0);
|
||||
|
||||
priv = NM_SETTING_WIRELESS_GET_PRIVATE (setting);
|
||||
|
||||
if ( !priv->seen_bssids
|
||||
|| i >= priv->seen_bssids->len)
|
||||
return NULL;
|
||||
|
||||
return priv->seen_bssids->pdata[i];
|
||||
}
|
||||
|
||||
static gboolean
|
||||
|
|
@ -723,8 +731,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|||
NMSettingWirelessPrivate *priv = NM_SETTING_WIRELESS_GET_PRIVATE (setting);
|
||||
const char *valid_modes[] = { NM_SETTING_WIRELESS_MODE_INFRA, NM_SETTING_WIRELESS_MODE_ADHOC, NM_SETTING_WIRELESS_MODE_AP, NULL };
|
||||
const char *valid_bands[] = { "a", "bg", NULL };
|
||||
GSList *iter;
|
||||
int i;
|
||||
guint i;
|
||||
gsize length;
|
||||
GError *local = NULL;
|
||||
|
||||
|
|
@ -846,15 +853,20 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|||
}
|
||||
}
|
||||
|
||||
for (iter = priv->seen_bssids; iter; iter = iter->next) {
|
||||
if (!nm_utils_hwaddr_valid (iter->data, ETH_ALEN)) {
|
||||
g_set_error (error,
|
||||
NM_CONNECTION_ERROR,
|
||||
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
||||
_("'%s' is not a valid MAC address"),
|
||||
(const char *) iter->data);
|
||||
g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_SEEN_BSSIDS);
|
||||
return FALSE;
|
||||
if (priv->seen_bssids) {
|
||||
for (i = 0; i < priv->seen_bssids->len; i++) {
|
||||
const char *b;
|
||||
|
||||
b = priv->seen_bssids->pdata[i];
|
||||
if (!nm_utils_hwaddr_valid (b, ETH_ALEN)) {
|
||||
g_set_error (error,
|
||||
NM_CONNECTION_ERROR,
|
||||
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
||||
_("'%s' is not a valid MAC address"),
|
||||
b);
|
||||
g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_SEEN_BSSIDS);
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1030,7 +1042,11 @@ get_property (GObject *object, guint prop_id,
|
|||
g_value_set_uint (value, nm_setting_wireless_get_mtu (setting));
|
||||
break;
|
||||
case PROP_SEEN_BSSIDS:
|
||||
g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->seen_bssids, TRUE));
|
||||
g_value_take_boxed (value,
|
||||
priv->seen_bssids
|
||||
? nm_utils_strv_dup (priv->seen_bssids->pdata,
|
||||
priv->seen_bssids->len)
|
||||
: NULL);
|
||||
break;
|
||||
case PROP_HIDDEN:
|
||||
g_value_set_boolean (value, nm_setting_wireless_get_hidden (setting));
|
||||
|
|
@ -1058,7 +1074,6 @@ set_property (GObject *object, guint prop_id,
|
|||
const char * const *blacklist;
|
||||
const char *mac;
|
||||
gboolean bool_val;
|
||||
int i;
|
||||
|
||||
switch (prop_id) {
|
||||
case PROP_SSID:
|
||||
|
|
@ -1113,7 +1128,9 @@ set_property (GObject *object, guint prop_id,
|
|||
case PROP_MAC_ADDRESS_BLACKLIST:
|
||||
blacklist = g_value_get_boxed (value);
|
||||
g_array_set_size (priv->mac_address_blacklist, 0);
|
||||
if (blacklist && *blacklist) {
|
||||
if (blacklist && blacklist[0]) {
|
||||
gsize i;
|
||||
|
||||
for (i = 0; blacklist[i]; i++) {
|
||||
mac = _nm_utils_hwaddr_canonical_or_invalid (blacklist[i], ETH_ALEN);
|
||||
g_array_append_val (priv->mac_address_blacklist, mac);
|
||||
|
|
@ -1123,10 +1140,23 @@ set_property (GObject *object, guint prop_id,
|
|||
case PROP_MTU:
|
||||
priv->mtu = g_value_get_uint (value);
|
||||
break;
|
||||
case PROP_SEEN_BSSIDS:
|
||||
g_slist_free_full (priv->seen_bssids, g_free);
|
||||
priv->seen_bssids = _nm_utils_strv_to_slist (g_value_get_boxed (value), TRUE);
|
||||
case PROP_SEEN_BSSIDS: {
|
||||
gs_unref_ptrarray GPtrArray *arr_old = NULL;
|
||||
const char *const*strv;
|
||||
|
||||
arr_old = g_steal_pointer (&priv->seen_bssids);
|
||||
|
||||
strv = g_value_get_boxed (value);
|
||||
if (strv && strv[0]) {
|
||||
gsize i, l;
|
||||
|
||||
l = NM_PTRARRAY_LEN (strv);
|
||||
priv->seen_bssids = g_ptr_array_new_full (l, g_free);
|
||||
for (i = 0; i < l; i++)
|
||||
g_ptr_array_add (priv->seen_bssids, g_strdup (strv[i]));
|
||||
}
|
||||
break;
|
||||
}
|
||||
case PROP_HIDDEN:
|
||||
priv->hidden = g_value_get_boolean (value);
|
||||
break;
|
||||
|
|
@ -1185,7 +1215,7 @@ finalize (GObject *object)
|
|||
g_free (priv->cloned_mac_address);
|
||||
g_free (priv->generate_mac_address_mask);
|
||||
g_array_unref (priv->mac_address_blacklist);
|
||||
g_slist_free_full (priv->seen_bssids, g_free);
|
||||
nm_clear_pointer (&priv->seen_bssids, g_ptr_array_unref);
|
||||
|
||||
G_OBJECT_CLASS (nm_setting_wireless_parent_class)->finalize (object);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue