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

ifupdown: ssid is now GBytes for quite some time

Browse Source 
Fixes: c43f88907b
This commit is contained in:
Lubomir Rintel
2016-03-14 13:14:12 +01:00
parent 5b14492b0b
commit b6bbf3df1e
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/settings/plugins/ifupdown/parser.c
View File

@@ -113,13 +113,12 @@ update_wireless_setting_from_if_block(NMConnection *connection,
const gchar* newkey = map_by_mapping(mapping, curr->key+wireless_l); const gchar* newkey = map_by_mapping(mapping, curr->key+wireless_l);
nm_log_info (LOGD_SETTINGS, "wireless setting key: %s='%s'", newkey, curr->data); nm_log_info (LOGD_SETTINGS, "wireless setting key: %s='%s'", newkey, curr->data);
if(newkey && !strcmp("ssid", newkey)) { if(newkey && !strcmp("ssid", newkey)) {
GByteArray *ssid; GBytes *ssid;
gint len = strlen(curr->data); gint len = strlen(curr->data);
ssid = g_byte_array_sized_new (len); ssid = g_bytes_new (curr->data, len);
g_byte_array_append (ssid, (const guint8 *) curr->data, len);
g_object_set (wireless_setting, NM_SETTING_WIRELESS_SSID, ssid, NULL); g_object_set (wireless_setting, NM_SETTING_WIRELESS_SSID, ssid, NULL);
g_byte_array_free (ssid, TRUE); g_bytes_unref (ssid);
nm_log_info (LOGD_SETTINGS, "setting wireless ssid = %d", len); nm_log_info (LOGD_SETTINGS, "setting wireless ssid = %d", len);
} else { } else {
g_object_set(wireless_setting, g_object_set(wireless_setting,
@@ -131,13 +130,12 @@ update_wireless_setting_from_if_block(NMConnection *connection,
const gchar* newkey = map_by_mapping(mapping, curr->key+wpa_l); const gchar* newkey = map_by_mapping(mapping, curr->key+wpa_l);
if(newkey && !strcmp("ssid", newkey)) { if(newkey && !strcmp("ssid", newkey)) {
GByteArray *ssid; GBytes *ssid;
gint len = strlen(curr->data); gint len = strlen(curr->data);
ssid = g_byte_array_sized_new (len); ssid = g_bytes_new (curr->data, len);
g_byte_array_append (ssid, (const guint8 *) curr->data, len);
g_object_set (wireless_setting, NM_SETTING_WIRELESS_SSID, ssid, NULL); g_object_set (wireless_setting, NM_SETTING_WIRELESS_SSID, ssid, NULL);
g_byte_array_free (ssid, TRUE); g_bytes_unref (ssid);
nm_log_info (LOGD_SETTINGS, "setting wpa ssid = %d", len); nm_log_info (LOGD_SETTINGS, "setting wpa ssid = %d", len);
} else if(newkey) { } else if(newkey) {