fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-01 00:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: add support for wifi.powersave setting

Browse source
This commit is contained in:
Dan Williams 2014-11-17 09:18:08 -06:00
parent 6a3531d02d
commit c3e319266c
1 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
clients/cli/settings.c
View file

@ -190,6 +190,7 @@ NmcOutputField nmc_fields_setting_wireless[] = {
SETTING_FIELD (NM_SETTING_WIRELESS_MTU, 6), /* 11 */
SETTING_FIELD (NM_SETTING_WIRELESS_SEEN_BSSIDS, 35), /* 12 */
SETTING_FIELD (NM_SETTING_WIRELESS_HIDDEN, 10), /* 13 */
SETTING_FIELD (NM_SETTING_WIRELESS_POWERSAVE, 10), /* 14 */
{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
};
#define NMC_FIELDS_SETTING_WIRELESS_ALL "name"","\
@ -205,7 +206,8 @@ NmcOutputField nmc_fields_setting_wireless[] = {
NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST","\
NM_SETTING_WIRELESS_MTU","\
NM_SETTING_WIRELESS_SEEN_BSSIDS","\
NM_SETTING_WIRELESS_HIDDEN
NM_SETTING_WIRELESS_HIDDEN"," \
NM_SETTING_WIRELESS_POWERSAVE
#define NMC_FIELDS_SETTING_WIRELESS_COMMON NMC_FIELDS_SETTING_WIRELESS_ALL
/* Available fields for NM_SETTING_WIRELESS_SECURITY_SETTING_NAME */
@ -1525,6 +1527,20 @@ nmc_property_wireless_get_mtu (NMSetting *setting)
return g_strdup_printf ("%d", mtu);
}
static char *
nmc_property_wireless_get_powersave (NMSetting *setting)
{
NMSettingWireless *s_wireless = NM_SETTING_WIRELESS (setting);
guint powersave = nm_setting_wireless_get_powersave (s_wireless);
if (powersave == 0)
return g_strdup (_("no"));
else if (powersave == 1)
return g_strdup (_("yes"));
else
return g_strdup_printf (_("yes (%u)"), powersave);
}
/* --- NM_SETTING_WIRELESS_SECURITY_SETTING_NAME property get functions --- */
DEFINE_GETTER (nmc_property_wifi_sec_get_key_mgmt, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT)
DEFINE_GETTER (nmc_property_wifi_sec_get_wep_tx_keyidx, NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX)
@ -4206,6 +4222,27 @@ DEFINE_REMOVER_INDEX_OR_VALUE (nmc_property_wireless_remove_mac_address_blacklis
nm_setting_wireless_remove_mac_blacklist_item,
_validate_and_remove_wifi_mac_blacklist_item)
/* 'powersave' */
static gboolean
nmc_property_wireless_set_powersave (NMSetting *setting, const char *prop, const char *val, GError **error)
{
unsigned long powersave_int;
gboolean val_bool = FALSE;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
if (!nmc_string_to_uint (val, TRUE, 0, G_MAXUINT32, &powersave_int)) {
if (!nmc_string_to_bool (val, &val_bool, NULL)) {
g_set_error (error, 1, 0, _("'%s' is not a valid powersave value"), val);
return FALSE;
}
powersave_int = val_bool ? 1 : 0;
}
g_object_set (setting, prop, (guint32) powersave_int, NULL);
return TRUE;
}
/* --- NM_SETTING_WIRELESS_SECURITY_SETTING_NAME property setter functions --- */
/* 'key-mgmt' */
static const char *wifi_sec_valid_key_mgmts[] = { "none", "ieee8021x", "wpa-none", "wpa-psk", "wpa-eap", NULL };
@ -6172,6 +6209,13 @@ nmc_properties_init (void)
NULL,
NULL,
NULL);
nmc_add_prop_funcs (GLUE (WIRELESS, POWERSAVE),
nmc_property_wireless_get_powersave,
nmc_property_wireless_set_powersave,
NULL,
NULL,
NULL,
NULL);
/* Add editable properties for NM_SETTING_WIRELESS_SECURITY_SETTING_NAME */
nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, KEY_MGMT),
@ -6757,6 +6801,7 @@ setting_wireless_details (NMSetting *setting, NmCli *nmc, const char *one_prop,
set_val_str (arr, 11, nmc_property_wireless_get_mtu (setting));
set_val_str (arr, 12, nmc_property_wireless_get_seen_bssids (setting));
set_val_str (arr, 13, nmc_property_wireless_get_hidden (setting));
set_val_str (arr, 14, nmc_property_wireless_get_powersave (setting));
g_ptr_array_add (nmc->output_data, arr);
print_data (nmc); /* Print all data */