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

ifupdown: set wireless mode

Browse Source
This commit is contained in:
Lubomir Rintel
2016-03-14 13:42:43 +01:00
parent b6bbf3df1e
commit 1b826d9dd9
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,6 +95,7 @@ update_wireless_setting_from_if_block(NMConnection *connection,
struct _Mapping mapping[] = { struct _Mapping mapping[] = {
{"ssid", "ssid"}, {"ssid", "ssid"},
{"essid", "ssid"}, {"essid", "ssid"},
{"mode", "mode"},
{ NULL, NULL} { NULL, NULL}
}; };
@@ -120,6 +121,15 @@ update_wireless_setting_from_if_block(NMConnection *connection,
g_object_set (wireless_setting, NM_SETTING_WIRELESS_SSID, ssid, NULL); g_object_set (wireless_setting, NM_SETTING_WIRELESS_SSID, ssid, NULL);
g_bytes_unref (ssid); 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 if(newkey && !strcmp("mode", newkey)) {
if (!g_ascii_strcasecmp (curr->data, "Managed") || !g_ascii_strcasecmp (curr->data, "Auto"))
g_object_set (wireless_setting, NM_SETTING_WIRELESS_MODE, NM_SETTING_WIRELESS_MODE_INFRA, NULL);
else if (!g_ascii_strcasecmp (curr->data, "Ad-Hoc"))
g_object_set (wireless_setting, NM_SETTING_WIRELESS_MODE, NM_SETTING_WIRELESS_MODE_ADHOC, NULL);
else if (!g_ascii_strcasecmp (curr->data, "Master"))
g_object_set (wireless_setting, NM_SETTING_WIRELESS_MODE, NM_SETTING_WIRELESS_MODE_AP, NULL);
else
nm_log_warn (LOGD_SETTINGS, "Invalid mode '%s' (not 'Ad-Hoc', 'Ap', 'Managed', or 'Auto')", curr->data);
} else { } else {
g_object_set(wireless_setting, g_object_set(wireless_setting,
newkey, curr->data, newkey, curr->data,