clients: Wi-Fi Mesh support
Allow setting mesh mode in wireless connections and recognize the Mesh support as indicated by the device flags.
This commit is contained in:
@@ -536,6 +536,9 @@ _metagen_device_detail_wifi_properties_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_AR
|
|||||||
: N_("no"))
|
: N_("no"))
|
||||||
: N_("unknown"),
|
: N_("unknown"),
|
||||||
get_type);
|
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:
|
default:
|
||||||
break;
|
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_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_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_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, 3, bssid);
|
||||||
set_val_strc (arr, 4, mode == NM_802_11_MODE_ADHOC ? _("Ad-Hoc")
|
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_INFRA ? _("Infra")
|
||||||
|
: mode == NM_802_11_MODE_MESH ? _("Mesh")
|
||||||
: _("N/A"));
|
: _("N/A"));
|
||||||
set_val_str (arr, 5, channel_str);
|
set_val_str (arr, 5, channel_str);
|
||||||
set_val_str (arr, 6, freq_str);
|
set_val_str (arr, 6, freq_str);
|
||||||
|
@@ -225,6 +225,7 @@ typedef enum {
|
|||||||
NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_ADHOC,
|
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_2GHZ,
|
||||||
NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_5GHZ,
|
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,
|
_NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_NUM,
|
||||||
|
|
||||||
} NmcGenericInfoType;
|
} NmcGenericInfoType;
|
||||||
|
@@ -7162,7 +7162,8 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS[] = {
|
|||||||
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
|
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
|
||||||
.values_static = NM_MAKE_STRV (NM_SETTING_WIRELESS_MODE_INFRA,
|
.values_static = NM_MAKE_STRV (NM_SETTING_WIRELESS_MODE_INFRA,
|
||||||
NM_SETTING_WIRELESS_MODE_ADHOC,
|
NM_SETTING_WIRELESS_MODE_ADHOC,
|
||||||
NM_SETTING_WIRELESS_MODE_AP),
|
NM_SETTING_WIRELESS_MODE_AP,
|
||||||
|
NM_SETTING_WIRELESS_MODE_MESH),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_BAND,
|
PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_BAND,
|
||||||
|
@@ -62,7 +62,8 @@ struct _NMDevice;
|
|||||||
#define NM_META_TEXT_WORD_INFRA "infrastructure"
|
#define NM_META_TEXT_WORD_INFRA "infrastructure"
|
||||||
#define NM_META_TEXT_WORD_AP "ap"
|
#define NM_META_TEXT_WORD_AP "ap"
|
||||||
#define NM_META_TEXT_WORD_ADHOC "adhoc"
|
#define NM_META_TEXT_WORD_ADHOC "adhoc"
|
||||||
#define NM_META_TEXT_PROMPT_WIFI_MODE_CHOICES "(" NM_META_TEXT_WORD_INFRA "/" NM_META_TEXT_WORD_AP "/" NM_META_TEXT_WORD_ADHOC ") [" NM_META_TEXT_WORD_INFRA "]"
|
#define NM_META_TEXT_WORD_MESH "mesh"
|
||||||
|
#define NM_META_TEXT_PROMPT_WIFI_MODE_CHOICES "(" NM_META_TEXT_WORD_INFRA "/" NM_META_TEXT_WORD_AP "/" NM_META_TEXT_WORD_ADHOC "/" NM_META_TEXT_WORD_MESH ") [" NM_META_TEXT_WORD_INFRA "]"
|
||||||
|
|
||||||
#define NM_META_TEXT_PROMPT_TUN_MODE N_("Tun mode")
|
#define NM_META_TEXT_PROMPT_TUN_MODE N_("Tun mode")
|
||||||
#define NM_META_TEXT_WORD_TUN "tun"
|
#define NM_META_TEXT_WORD_TUN "tun"
|
||||||
|
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user