summaryrefslogtreecommitdiff
path: root/clients/cli
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2019-01-24 15:33:41 +0100
committerLubomir Rintel <lkundrak@v3.sk>2019-07-29 11:00:24 +0200
commitdd80d3c6be6ee7e9c3349fd6cb7cb6f22821149a (patch)
tree016543c0dd88d1dbf565adc99b4226250065917c /clients/cli
parent90fb359b8860fb5d0d52b83f82e2be0039a6c964 (diff)
downloadNetworkManager-dd80d3c6be6ee7e9c3349fd6cb7cb6f22821149a.tar.gz
clients: Wi-Fi Mesh supportlr/wifi-mesh
Allow setting mesh mode in wireless connections and recognize the Mesh support as indicated by the device flags.
Diffstat (limited to 'clients/cli')
-rw-r--r--clients/cli/devices.c5
-rw-r--r--clients/cli/utils.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index 1285972876..c00d3191a9 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -536,6 +536,9 @@ _metagen_device_detail_wifi_properties_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_AR
: N_("no"))
: N_("unknown"),
get_type);
+ case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_MESH:
+ return nmc_meta_generic_get_bool (NM_FLAGS_HAS (wcaps, NM_WIFI_DEVICE_CAP_MESH),
+ get_type);
default:
break;
}
@@ -555,6 +558,7 @@ const NmcMetaGenericInfo *const metagen_device_detail_wifi_properties[_NMC_GENER
_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_ADHOC, "ADHOC"),
_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_2GHZ, "2GHZ"),
_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_5GHZ, "5GHZ"),
+ _METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_MESH, "MESH"),
};
/*****************************************************************************/
@@ -1188,6 +1192,7 @@ fill_output_access_point (gpointer data, gpointer user_data)
set_val_strc (arr, 3, bssid);
set_val_strc (arr, 4, mode == NM_802_11_MODE_ADHOC ? _("Ad-Hoc")
: mode == NM_802_11_MODE_INFRA ? _("Infra")
+ : mode == NM_802_11_MODE_MESH ? _("Mesh")
: _("N/A"));
set_val_str (arr, 5, channel_str);
set_val_str (arr, 6, freq_str);
diff --git a/clients/cli/utils.h b/clients/cli/utils.h
index b84b35bff5..82b186b768 100644
--- a/clients/cli/utils.h
+++ b/clients/cli/utils.h
@@ -225,6 +225,7 @@ typedef enum {
NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_ADHOC,
NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_2GHZ,
NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_5GHZ,
+ NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_MESH,
_NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_NUM,
} NmcGenericInfoType;