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

wifi: use GBytes instead of GBytesArray for tracking blobs in supplicant

Browse source
This commit is contained in:
Thomas Haller 2018-08-12 16:51:16 +02:00
parent 4607970288
commit dc316c8afe
2 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/supplicant/nm-supplicant-config.c
View file

@ -88,12 +88,6 @@ config_option_free (ConfigOption *opt)
g_slice_free (ConfigOption, opt); g_slice_free (ConfigOption, opt);
} }
static void
blob_free (GByteArray *array)
{
g_byte_array_free (array, TRUE);
}
static void static void
nm_supplicant_config_init (NMSupplicantConfig * self) nm_supplicant_config_init (NMSupplicantConfig * self)
{ {
@ -105,7 +99,7 @@ nm_supplicant_config_init (NMSupplicantConfig * self)
priv->blobs = g_hash_table_new_full (nm_str_hash, g_str_equal, priv->blobs = g_hash_table_new_full (nm_str_hash, g_str_equal,
(GDestroyNotify) g_free, (GDestroyNotify) g_free,
(GDestroyNotify) blob_free); (GDestroyNotify) g_bytes_unref);
priv->ap_scan = 1; priv->ap_scan = 1;
priv->dispose_has_run = FALSE; priv->dispose_has_run = FALSE;
@ -198,7 +192,6 @@ nm_supplicant_config_add_blob (NMSupplicantConfig *self,
ConfigOption *old_opt; ConfigOption *old_opt;
ConfigOption *opt; ConfigOption *opt;
OptType type; OptType type;
GByteArray *blob;
const guint8 *data; const guint8 *data;
gsize data_len; gsize data_len;
@ -226,9 +219,6 @@ nm_supplicant_config_add_blob (NMSupplicantConfig *self,
return FALSE; return FALSE;
} }
blob = g_byte_array_sized_new (data_len);
g_byte_array_append (blob, data, data_len);
opt = g_slice_new0 (ConfigOption); opt = g_slice_new0 (ConfigOption);
opt->value = g_strdup_printf ("blob://%s", blobid); opt->value = g_strdup_printf ("blob://%s", blobid);
opt->len = strlen (opt->value); opt->len = strlen (opt->value);
@ -237,7 +227,9 @@ nm_supplicant_config_add_blob (NMSupplicantConfig *self,
nm_log_info (LOGD_SUPPLICANT, "Config: added '%s' value '%s'", key, opt->value); nm_log_info (LOGD_SUPPLICANT, "Config: added '%s' value '%s'", key, opt->value);
g_hash_table_insert (priv->config, g_strdup (key), opt); g_hash_table_insert (priv->config, g_strdup (key), opt);
g_hash_table_insert (priv->blobs, g_strdup (blobid), blob); g_hash_table_insert (priv->blobs,
g_strdup (blobid),
g_bytes_ref (value));
return TRUE; return TRUE;
} }

5
src/supplicant/nm-supplicant-interface.c
View file

@ -1579,7 +1579,7 @@ assoc_add_network_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_dat
GHashTable *blobs; GHashTable *blobs;
GHashTableIter iter; GHashTableIter iter;
const char *blob_name; const char *blob_name;
GByteArray *blob_data; GBytes *blob_data;
assoc_data = add_network_data->assoc_data; assoc_data = add_network_data->assoc_data;
if (assoc_data) if (assoc_data)
@ -1637,8 +1637,7 @@ assoc_add_network_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_dat
"AddBlob", "AddBlob",
g_variant_new ("(s@ay)", g_variant_new ("(s@ay)",
blob_name, blob_name,
g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE, nm_utils_gbytes_to_variant_ay (blob_data)),
blob_data->data, blob_data->len, 1)),
G_DBUS_CALL_FLAGS_NONE, G_DBUS_CALL_FLAGS_NONE,
-1, -1,
priv->assoc_data->cancellable, priv->assoc_data->cancellable,