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

libnm/docs: merge branch 'th/libnm-doc-deprecated'

Browse Source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1567
This commit is contained in:
Thomas Haller
2023-03-27 11:23:19 +02:00
parent f2eae12c84 8a2e279ed6
commit 83d2ec2ec1
20 changed files with 664 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libnm-client-impl/nm-active-connection.c
View File

@@ -385,7 +385,7 @@ nm_active_connection_get_vpn(NMActiveConnection *connection)
*
* Returns: (transfer none): the master #NMDevice of the #NMActiveConnection.
*
* Deprecated: 1.44. Use nm_active_connection_get_controller() instead.
* Deprecated: 1.44: Use nm_active_connection_get_controller() instead.
**/
NMDevice *
nm_active_connection_get_master(NMActiveConnection *connection)

2
src/libnm-client-impl/nm-device-bond.c
View File

@@ -82,7 +82,7 @@ nm_device_bond_get_carrier(NMDeviceBond *device)
* #NMDevices that are slaves of @device. This is the internal
* copy used by the device, and must not be modified.
*
* Deprecated: 1.34 Use nm_device_get_ports() instead.
* Deprecated: 1.34: Use nm_device_get_ports() instead.
**/
const GPtrArray *
nm_device_bond_get_slaves(NMDeviceBond *device)

2
src/libnm-client-impl/nm-device-bridge.c
View File

@@ -82,7 +82,7 @@ nm_device_bridge_get_carrier(NMDeviceBridge *device)
* #NMDevices that are slaves of @device. This is the internal
* copy used by the device, and must not be modified.
*
* Deprecated: 1.34 Use nm_device_get_ports() instead.
* Deprecated: 1.34: Use nm_device_get_ports() instead.
**/
const GPtrArray *
nm_device_bridge_get_slaves(NMDeviceBridge *device)

2
src/libnm-client-impl/nm-device-ovs-bridge.c
View File

@@ -44,7 +44,7 @@ G_DEFINE_TYPE(NMDeviceOvsBridge, nm_device_ovs_bridge, NM_TYPE_DEVICE)
*
* Since: 1.14
*
* Deprecated: 1.34 Use nm_device_get_ports() instead.
* Deprecated: 1.34: Use nm_device_get_ports() instead.
**/
const GPtrArray *
nm_device_ovs_bridge_get_slaves(NMDeviceOvsBridge *device)

2
src/libnm-client-impl/nm-device-ovs-port.c
View File

@@ -44,7 +44,7 @@ G_DEFINE_TYPE(NMDeviceOvsPort, nm_device_ovs_port, NM_TYPE_DEVICE)
*
* Since: 1.14
*
* Deprecated: 1.34 Use nm_device_get_ports() instead.
* Deprecated: 1.34: Use nm_device_get_ports() instead.
**/
const GPtrArray *
nm_device_ovs_port_get_slaves(NMDeviceOvsPort *device)

2
src/libnm-client-impl/nm-device-team.c
View File

@@ -83,7 +83,7 @@ nm_device_team_get_carrier(NMDeviceTeam *device)
* #NMDevices that are slaves of @device. This is the internal
* copy used by the device, and must not be modified.
*
* Deprecated: 1.34 Use nm_device_get_ports() instead.
* Deprecated: 1.34: Use nm_device_get_ports() instead.
**/
const GPtrArray *
nm_device_team_get_slaves(NMDeviceTeam *device)

3
src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.xml.in
View File

@@ -124,6 +124,7 @@
gprop-type="guint"
/>
<property name="rate"
is-deprecated="1"
dbus-type="u"
gprop-type="guint"
/>
@@ -140,6 +141,7 @@
gprop-type="GBytes"
/>
<property name="tx-power"
is-deprecated="1"
dbus-type="u"
gprop-type="guint"
/>
@@ -826,6 +828,7 @@
gprop-type="GStrv"
/>
<property name="read-only"
is-deprecated="1"
dbus-type="b"
gprop-type="gboolean"
/>

38
src/libnm-core-impl/nm-connection.c
View File

@@ -883,6 +883,20 @@ _normalize_connection_uuid(NMConnection *self)
return TRUE;
}
static gboolean
_normalize_connection(NMConnection *self)
{
NMSettingConnection *s_con = nm_connection_get_setting_connection(self);
gboolean changed = FALSE;
if (nm_setting_connection_get_read_only(s_con)) {
g_object_set(s_con, NM_SETTING_CONNECTION_READ_ONLY, FALSE, NULL);
changed = TRUE;
}
return changed;
}
gboolean
_nm_setting_connection_verify_secondaries(GArray *secondaries, GError **error)
{
@@ -1448,6 +1462,28 @@ _normalize_wireless_mac_address_randomization(NMConnection *self)
return FALSE;
}
static gboolean
_normalize_wireless(NMConnection *self)
{
NMSettingWireless *s_wifi = nm_connection_get_setting_wireless(self);
gboolean changed = FALSE;
if (!s_wifi)
return FALSE;
if (nm_setting_wireless_get_rate(s_wifi) != 0) {
g_object_set(s_wifi, NM_SETTING_WIRELESS_RATE, 0u, NULL);
changed = TRUE;
}
if (nm_setting_wireless_get_tx_power(s_wifi) != 0) {
g_object_set(s_wifi, NM_SETTING_WIRELESS_TX_POWER, 0u, NULL);
changed = TRUE;
}
return changed;
}
static gboolean
_normalize_macsec(NMConnection *self)
{
@@ -1983,6 +2019,7 @@ _connection_normalize(NMConnection *connection,
was_modified |= _normalize_connection_type(connection);
was_modified |= _normalize_connection_slave_type(connection);
was_modified |= _normalize_connection_secondaries(connection);
was_modified |= _normalize_connection(connection);
was_modified |= _normalize_required_settings(connection);
was_modified |= _normalize_invalid_slave_port_settings(connection);
was_modified |= _normalize_ip_config(connection, parameters);
@@ -1991,6 +2028,7 @@ _connection_normalize(NMConnection *connection,
was_modified |= _normalize_bond_mode(connection);
was_modified |= _normalize_bond_options(connection);
was_modified |= _normalize_wireless_mac_address_randomization(connection);
was_modified |= _normalize_wireless(connection);
was_modified |= _normalize_macsec(connection);
was_modified |= _normalize_team_config(connection);
was_modified |= _normalize_team_port_config(connection);

23
src/libnm-core-impl/nm-setting-connection.c
View File

@@ -647,6 +647,8 @@ _to_dbus_fcn_timestamp(_NM_SETT_INFO_PROP_TO_DBUS_FCN_ARGS _nm_nil)
* Returns the #NMSettingConnection:read-only property of the connection.
*
* Returns: %TRUE if the connection is read-only, %FALSE if it is not
*
* Deprecated: 1.44: This property is deprecated and has no meaning.
**/
gboolean
nm_setting_connection_get_read_only(NMSettingConnection *setting)
@@ -1608,6 +1610,18 @@ after_interface_name:
if (!_nm_setting_connection_verify_secondaries(priv->secondaries.arr, error))
return NM_SETTING_VERIFY_NORMALIZABLE;
if (priv->read_only) {
g_set_error_literal(error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_MISSING_PROPERTY,
_("read-only is deprecated and not settable for the user"));
g_prefix_error(error,
"%s.%s: ",
NM_SETTING_CONNECTION_SETTING_NAME,
NM_SETTING_CONNECTION_READ_ONLY);
return NM_SETTING_VERIFY_NORMALIZABLE;
}
return TRUE;
}
@@ -2191,9 +2205,9 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
/**
* NMSettingConnection:read-only:
*
* %FALSE if the connection can be modified using the provided settings
* service's D-Bus interface with the right privileges, or %TRUE if the
* connection is read-only and cannot be modified.
* This property is deprecated and has no meaning.
*
* Deprecated: 1.44: This property is deprecated and has no meaning.
**/
_nm_setting_property_define_direct_boolean(properties_override,
obj_properties,
@@ -2202,7 +2216,8 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
FALSE,
NM_SETTING_PARAM_FUZZY_IGNORE,
NMSettingConnectionPrivate,
read_only);
read_only,
.is_deprecated = TRUE, );
/**
* NMSettingConnection:zone:

61
src/libnm-core-impl/nm-setting-wireless.c
View File

@@ -392,6 +392,8 @@ nm_setting_wireless_get_bssid(NMSettingWireless *setting)
* @setting: the #NMSettingWireless
*
* Returns: the #NMSettingWireless:rate property of the setting
*
* Deprecated: 1.44: This setting is not implemented and has no effect.
**/
guint32
nm_setting_wireless_get_rate(NMSettingWireless *setting)
@@ -406,6 +408,8 @@ nm_setting_wireless_get_rate(NMSettingWireless *setting)
* @setting: the #NMSettingWireless
*
* Returns: the #NMSettingWireless:tx-power property of the setting
*
* Deprecated: 1.44: This setting is not implemented and has no effect.
**/
guint32
nm_setting_wireless_get_tx_power(NMSettingWireless *setting)
@@ -1100,6 +1104,19 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
return NM_SETTING_VERIFY_NORMALIZABLE;
mac_addr_rand_ok:
if (priv->tx_power != 0 || priv->rate != 0) {
g_set_error(error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY,
_("property is deprecated and not implemented"));
g_prefix_error(error,
"%s.%s: ",
NM_SETTING_WIRELESS_SETTING_NAME,
priv->tx_power != 0 ? NM_SETTING_WIRELESS_TX_POWER
: NM_SETTING_WIRELESS_RATE);
return NM_SETTING_VERIFY_NORMALIZABLE;
}
return TRUE;
}
@@ -1434,15 +1451,14 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass)
/**
* NMSettingWireless:rate:
*
* If non-zero, directs the device to only use the specified bitrate for
* communication with the access point. Units are in Kb/s, ie 5500 = 5.5
* Mbit/s. This property is highly driver dependent and not all devices
* support setting a static bitrate.
* This property is not implemented and has no effect.
*
* Deprecated: 1.44: This property is not implemented and has no effect.
**/
/* ---ifcfg-rh---
* property: rate
* variable: (none)
* description: This property is not handled by ifcfg-rh plugin.
* description: This property is deprecated and not handled by ifcfg-rh plugin.
* ---end---
*/
_nm_setting_property_define_direct_uint32(properties_override,
@@ -1454,19 +1470,20 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass)
0,
NM_SETTING_PARAM_FUZZY_IGNORE,
NMSettingWirelessPrivate,
rate);
rate,
.is_deprecated = TRUE, );
/**
* NMSettingWireless:tx-power:
*
* If non-zero, directs the device to use the specified transmit power.
* Units are dBm. This property is highly driver dependent and not all
* devices support setting a static transmit power.
* This property is not implemented and has no effect.
*
* Deprecated: 1.44: This property is not implemented and has no effect.
**/
/* ---ifcfg-rh---
* property: tx-power
* variable: (none)
* description: This property is not handled by ifcfg-rh plugin.
* description: This property is deprecated and not handled by ifcfg-rh plugin.
* ---end---
*/
_nm_setting_property_define_direct_uint32(properties_override,
@@ -1478,7 +1495,8 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass)
0,
NM_SETTING_PARAM_FUZZY_IGNORE,
NMSettingWirelessPrivate,
tx_power);
tx_power,
.is_deprecated = TRUE, );
/**
* NMSettingWireless:mac-address:
@@ -1675,11 +1693,16 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass)
* property is only meant for reading and reflects the BSSID list of
* NetworkManager. The changes you make to this property will not be
* preserved.
*
* This is not a regular property that the user would configure. Instead,
* NetworkManager automatically sets the seen BSSIDs and tracks them internally
* in "/var/lib/NetworkManager/seen-bssids" file.
**/
/* ---ifcfg-rh---
* property: seen-bssids
* variable: (none)
* description: This property is not handled by ifcfg-rh plugin.
* description: This is not a regular property that would be configured by the
* user. It is not handled by ifcfg-rh plugin.
* ---end---
*/
obj_properties[PROP_SEEN_BSSIDS] = g_param_spec_boxed(
@@ -1814,19 +1837,11 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass)
mac_address_randomization,
.is_deprecated = TRUE, );
/* Compatibility for deprecated property */
/* ---ifcfg-rh---
* property: security
* variable: (none)
* description: This property is deprecated and not handled by ifcfg-rh-plugin.
* ---end---
*/
/* ---dbus---
* property: security
* description: This property is deprecated, but can be set to the value
* '802-11-wireless-security' when a wireless security setting is also
* present in the connection dictionary, for compatibility with very old
* NetworkManager daemons.
* description: This property is deprecated and has no effect.
* For backwards compatibility, it can be set to "802-11-wireless-security"
* if the profile has a wireless security setting.
* ---end---
*/
_nm_properties_override_dbus(

2
src/libnm-core-impl/tests/test-general.c
View File

@@ -3210,7 +3210,7 @@ test_setting_new_from_dbus_bad(void)
nmtst_assert_success(conn, error);
setting = nm_connection_get_setting(conn, NM_TYPE_SETTING_WIRELESS);
g_assert(setting);
g_assert_cmpint(nm_setting_wireless_get_rate(NM_SETTING_WIRELESS(setting)), ==, 10);
g_assert_cmpint(nm_setting_wireless_get_rate(NM_SETTING_WIRELESS(setting)), ==, 0);
g_object_unref(conn);
g_variant_unref(dict);

4
src/libnm-core-public/nm-dbus-interface.h
View File

@@ -447,7 +447,7 @@ typedef enum /*< flags >*/ {
* @NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS: modem supports at least one of GSM,
* GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability
* @NM_DEVICE_MODEM_CAPABILITY_LTE: modem has LTE data capability
* @NM_DEVICE_MODEM_CAPABILITY_5GNR: modem has 5GNR data capability (Since: 1.36)
* @NM_DEVICE_MODEM_CAPABILITY_5GNR: modem has 5GNR data capability. Since: 1.36.
*
* #NMDeviceModemCapabilities values indicate the generic radio access
* technology families a modem device supports. For more information on the
@@ -986,7 +986,7 @@ typedef enum {
*
* The flags for CheckpointCreate call
*
* Since: 1.12 (public since 1.4, g-ir since 1.12)
* Since: 1.12: Public since 1.4, g-ir since 1.12.
*/
typedef enum /*< flags >*/ {
NM_CHECKPOINT_CREATE_FLAG_NONE = 0,

4
src/libnm-core-public/nm-setting-connection.h
View File

@@ -170,7 +170,9 @@ int nm_setting_connection_get_autoconnect_retries(NMSettingConnection *setting);
NM_AVAILABLE_IN_1_14
NMConnectionMultiConnect nm_setting_connection_get_multi_connect(NMSettingConnection *setting);
guint64 nm_setting_connection_get_timestamp(NMSettingConnection *setting);
gboolean nm_setting_connection_get_read_only(NMSettingConnection *setting);
NM_DEPRECATED_IN_1_44
gboolean nm_setting_connection_get_read_only(NMSettingConnection *setting);
guint32 nm_setting_connection_get_num_permissions(NMSettingConnection *setting);
gboolean nm_setting_connection_get_permission(NMSettingConnection *setting,

9
src/libnm-core-public/nm-setting-wireless.h
View File

@@ -155,8 +155,13 @@ const char *nm_setting_wireless_get_mode(NMSettingWireless *setting);
const char *nm_setting_wireless_get_band(NMSettingWireless *setting);
guint32 nm_setting_wireless_get_channel(NMSettingWireless *setting);
const char *nm_setting_wireless_get_bssid(NMSettingWireless *setting);
guint32 nm_setting_wireless_get_rate(NMSettingWireless *setting);
guint32 nm_setting_wireless_get_tx_power(NMSettingWireless *setting);
NM_DEPRECATED_IN_1_44
guint32 nm_setting_wireless_get_rate(NMSettingWireless *setting);
NM_DEPRECATED_IN_1_44
guint32 nm_setting_wireless_get_tx_power(NMSettingWireless *setting);
const char *nm_setting_wireless_get_mac_address(NMSettingWireless *setting);
const char *nm_setting_wireless_get_cloned_mac_address(NMSettingWireless *setting);

11
src/libnmc-setting/nm-meta-setting-desc.c
View File

@@ -5531,9 +5531,6 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_TIMESTAMP,
.property_type = &_pt_gobject_readonly,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_READ_ONLY,
.property_type = &_pt_gobject_readonly,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_PERMISSIONS,
.describe_message =
N_("Enter a list of user permissions. This is a list of user names formatted as:\n"
@@ -8027,14 +8024,6 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS[] = {
PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_BSSID,
.property_type = &_pt_gobject_mac,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_RATE,
/* Do not allow setting 'rate'. It is not implemented in NM core. */
.property_type = &_pt_gobject_readonly,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_TX_POWER,
/* Do not allow setting 'tx-power'. It is not implemented in NM core. */
.property_type = &_pt_gobject_readonly,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_MAC_ADDRESS,
.property_type = &_pt_gobject_mac,
.is_cli_option = TRUE,

8
src/libnmc-setting/settings-docs.h.in
View File

@@ -18,7 +18,7 @@
#define DESCRIBE_DOC_NM_SETTING_CONNECTION_MUD_URL N_("If configured, set to a Manufacturer Usage Description (MUD) URL that points to manufacturer-recommended network policies for IoT devices. It is transmitted as a DHCPv4 or DHCPv6 option. The value must be a valid URL starting with \"https://\". The special value \"none\" is allowed to indicate that no MUD URL is used. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the ultimate default is \"none\".")
#define DESCRIBE_DOC_NM_SETTING_CONNECTION_MULTI_CONNECT N_("Specifies whether the profile can be active multiple times at a particular moment. The value is of type NMConnectionMultiConnect.")
#define DESCRIBE_DOC_NM_SETTING_CONNECTION_PERMISSIONS N_("An array of strings defining what access a given user has to this connection. If this is NULL or empty, all users are allowed to access this connection; otherwise users are allowed if and only if they are in this list. When this is not empty, the connection can be active only when one of the specified users is logged into an active session. Each entry is of the form \"[type]:[id]:[reserved]\"; for example, \"user:dcbw:blah\". At this time only the \"user\" [type] is allowed. Any other values are ignored and reserved for future use. [id] is the username that this permission refers to, which may not contain the \":\" character. Any [reserved] information present must be ignored and is reserved for future use. All of [type], [id], and [reserved] must be valid UTF-8.")
#define DESCRIBE_DOC_NM_SETTING_CONNECTION_READ_ONLY N_("FALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.")
#define DESCRIBE_DOC_NM_SETTING_CONNECTION_READ_ONLY N_("This property is deprecated and has no meaning.")
#define DESCRIBE_DOC_NM_SETTING_CONNECTION_SECONDARIES N_("List of connection UUIDs that should be activated when the base connection itself is activated. Currently, only VPN connections are supported.")
#define DESCRIBE_DOC_NM_SETTING_CONNECTION_SLAVE_TYPE N_("Setting name of the device type of this slave's master connection (eg, \"bond\"), or NULL if this connection is not a slave.")
#define DESCRIBE_DOC_NM_SETTING_CONNECTION_STABLE_ID N_("This represents the identity of the connection used for various purposes. It allows to configure multiple profiles to share the identity. Also, the stable-id can contain placeholders that are substituted dynamically and deterministically depending on the context. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is also used to derive the DHCP client identifier with ipv4.dhcp-client-id=stable, the DHCPv6 DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid] and the DHCP IAID with ipv4.iaid=stable and ipv6.iaid=stable. Note that depending on the context where it is used, other parameters are also seeded into the generation algorithm. For example, a per-host key is commonly also included, so that different systems end up generating different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so that different interfaces yield different addresses. The per-host key is the identity of your machine and stored in /var/lib/NetworkManager/secret_key. See NetworkManager(8) manual about the secret-key and the host identity. The '$' character is treated special to perform dynamic substitutions at runtime. Currently, supported are \"${CONNECTION}\", \"${DEVICE}\", \"${MAC}\", \"${BOOT}\", \"${RANDOM}\". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that \"${DEVICE}\" corresponds to the interface name of the device and \"${MAC}\" is the permanent MAC address of the device. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-${DEVICE}\" to create a unique id for this connection that changes with every reboot and differs depending on the interface where the profile activates. If the value is unset, a global connection default is consulted. If the value is still unset, the default is similar to \"${CONNECTION}\" and uses a unique, fixed ID for the connection.")
@@ -408,10 +408,10 @@
#define DESCRIBE_DOC_NM_SETTING_WIRELESS_MODE N_("Wi-Fi network mode; one of \"infrastructure\", \"mesh\", \"adhoc\" or \"ap\". If blank, infrastructure is assumed.")
#define DESCRIBE_DOC_NM_SETTING_WIRELESS_MTU N_("If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.")
#define DESCRIBE_DOC_NM_SETTING_WIRELESS_POWERSAVE N_("One of NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (disable Wi-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (enable Wi-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (don't touch currently configure setting) or NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (use the globally configured value). All other values are reserved.")
#define DESCRIBE_DOC_NM_SETTING_WIRELESS_RATE N_("If non-zero, directs the device to only use the specified bitrate for communication with the access point. Units are in Kb/s, ie 5500 = 5.5 Mbit/s. This property is highly driver dependent and not all devices support setting a static bitrate.")
#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SEEN_BSSIDS N_("A list of BSSIDs (each BSSID formatted as a MAC address like \"00:11:22:33:44:55\") that have been detected as part of the Wi-Fi network. NetworkManager internally tracks previously seen BSSIDs. The property is only meant for reading and reflects the BSSID list of NetworkManager. The changes you make to this property will not be preserved.")
#define DESCRIBE_DOC_NM_SETTING_WIRELESS_RATE N_("This property is not implemented and has no effect.")
#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SEEN_BSSIDS N_("A list of BSSIDs (each BSSID formatted as a MAC address like \"00:11:22:33:44:55\") that have been detected as part of the Wi-Fi network. NetworkManager internally tracks previously seen BSSIDs. The property is only meant for reading and reflects the BSSID list of NetworkManager. The changes you make to this property will not be preserved. This is not a regular property that the user would configure. Instead, NetworkManager automatically sets the seen BSSIDs and tracks them internally in \"/var/lib/NetworkManager/seen-bssids\" file.")
#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SSID N_("SSID of the Wi-Fi network. Must be specified.")
#define DESCRIBE_DOC_NM_SETTING_WIRELESS_TX_POWER N_("If non-zero, directs the device to use the specified transmit power. Units are dBm. This property is highly driver dependent and not all devices support setting a static transmit power.")
#define DESCRIBE_DOC_NM_SETTING_WIRELESS_TX_POWER N_("This property is not implemented and has no effect.")
#define DESCRIBE_DOC_NM_SETTING_WIRELESS_WAKE_ON_WLAN N_("The NMSettingWirelessWakeOnWLan options to enable. Not all devices support all options. May be any combination of NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY (0x2), NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT (0x4), NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC (0x8), NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE (0x10), NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST (0x20), NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE (0x40), NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE (0x80), NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP (0x100) or the special values NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT (0x1) (to use global settings) and NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (0x8000) (to disable management of Wake-on-LAN in NetworkManager).")
#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_AUTH_ALG N_("When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the 802.11 authentication algorithm required by the AP here. One of \"open\" for Open System, \"shared\" for Shared Key, or \"leap\" for Cisco LEAP. When using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") the \"leap-username\" and \"leap-password\" properties must be specified.")
#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_FILS N_("Indicates whether Fast Initial Link Setup (802.11ai) must be enabled for the connection. One of NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (use global default value), NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) (disable FILS), NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (enable FILS if the supplicant and the access point support it) or NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (enable FILS and fail if not supported). When set to NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) and no global default is set, FILS will be optionally enabled.")

8
src/nmcli/gen-metadata-nm-settings-nmcli.xml.in
View File

@@ -30,10 +30,6 @@
description="Wireless channel to use for the Wi-Fi connection. The device will only join (or create for Ad-Hoc networks) a Wi-Fi network on the specified channel. Because channel numbers overlap between bands, this property also requires the &quot;band&quot; property to be set." />
<property name="bssid"
description="If specified, directs the device to only associate with the given access point. This capability is highly driver dependent and not supported by all devices. Note: this property does not control the BSSID used when creating an Ad-Hoc network and is unlikely to in the future. Locking a client profile to a certain BSSID will prevent roaming and also disable background scanning. That can be useful, if there is only one access point for the SSID." />
<property name="rate"
description="If non-zero, directs the device to only use the specified bitrate for communication with the access point. Units are in Kb/s, ie 5500 = 5.5 Mbit/s. This property is highly driver dependent and not all devices support setting a static bitrate." />
<property name="tx-power"
description="If non-zero, directs the device to use the specified transmit power. Units are dBm. This property is highly driver dependent and not all devices support setting a static transmit power." />
<property name="mac-address"
alias="mac"
description="If specified, this connection will only apply to the Wi-Fi device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing)." />
@@ -50,7 +46,7 @@
alias="mtu"
description="If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames." />
<property name="seen-bssids"
description="A list of BSSIDs (each BSSID formatted as a MAC address like &quot;00:11:22:33:44:55&quot;) that have been detected as part of the Wi-Fi network. NetworkManager internally tracks previously seen BSSIDs. The property is only meant for reading and reflects the BSSID list of NetworkManager. The changes you make to this property will not be preserved." />
description="A list of BSSIDs (each BSSID formatted as a MAC address like &quot;00:11:22:33:44:55&quot;) that have been detected as part of the Wi-Fi network. NetworkManager internally tracks previously seen BSSIDs. The property is only meant for reading and reflects the BSSID list of NetworkManager. The changes you make to this property will not be preserved. This is not a regular property that the user would configure. Instead, NetworkManager automatically sets the seen BSSIDs and tracks them internally in &quot;/var/lib/NetworkManager/seen-bssids&quot; file." />
<property name="hidden"
description="If TRUE, indicates that the network is a non-broadcasting network that hides its SSID. This works both in infrastructure and AP mode. In infrastructure mode, various workarounds are used for a more reliable discovery of hidden networks, such as probe-scanning the SSID. However, these workarounds expose inherent insecurities with hidden SSID networks, and thus hidden SSID networks should be used with caution. In AP mode, the created network does not broadcast its SSID. Note that marking the network as hidden may be a privacy issue for you (in infrastructure mode) or client stations (in AP mode), as the explicit probe-scans are distinctly recognizable on the air." />
<property name="powersave"
@@ -391,8 +387,6 @@
description="The number of retries for the authentication. Zero means to try indefinitely; -1 means to use a global default. If the global default is not set, the authentication retries for 3 times before failing the connection. Currently, this only applies to 802-1x authentication." />
<property name="timestamp"
description="The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved)." />
<property name="read-only"
description="FALSE if the connection can be modified using the provided settings service&apos;s D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified." />
<property name="permissions"
description="An array of strings defining what access a given user has to this connection. If this is NULL or empty, all users are allowed to access this connection; otherwise users are allowed if and only if they are in this list. When this is not empty, the connection can be active only when one of the specified users is logged into an active session. Each entry is of the form &quot;[type]:[id]:[reserved]&quot;; for example, &quot;user:dcbw:blah&quot;. At this time only the &quot;user&quot; [type] is allowed. Any other values are ignored and reserved for future use. [id] is the username that this permission refers to, which may not contain the &quot;:&quot; character. Any [reserved] information present must be ignored and is reserved for future use. All of [type], [id], and [reserved] must be valid UTF-8." />
<property name="zone"

10
src/tests/client/test-client.check-on-disk/test_002.expected
View File

@@ -502,12 +502,12 @@ NAME UUID TYPE DEVICE
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet --
<<<
size: 1416
size: 1373
location: src/tests/client/test-client.py:test_002()/23
cmd: $NMCLI c s con-1
lang: C
returncode: 0
stdout: 1288 bytes
stdout: 1245 bytes
>>>
connection.id: con-1
connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -520,7 +520,6 @@ connection.autoconnect-retries: -1 (default)
connection.multi-connect: 0 (default)
connection.auth-retries: -1
connection.timestamp: 0
connection.read-only: no
connection.permissions: --
connection.zone: --
connection.master: --
@@ -538,12 +537,12 @@ connection.wait-device-timeout: -1
connection.wait-activation-delay: -1
<<<
size: 1428
size: 1384
location: src/tests/client/test-client.py:test_002()/24
cmd: $NMCLI c s con-1
lang: pl_PL.UTF-8
returncode: 0
stdout: 1290 bytes
stdout: 1246 bytes
>>>
connection.id: con-1
connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -556,7 +555,6 @@ connection.autoconnect-retries: -1 (default)
connection.multi-connect: 0 (default)
connection.auth-retries: -1
connection.timestamp: 0
connection.read-only: nie
connection.permissions: --
connection.zone: --
connection.master: --

538
src/tests/client/test-client.check-on-disk/test_003.expected
View File

File diff suppressed because it is too large Load Diff

682
src/tests/client/test-client.check-on-disk/test_004.expected
View File

File diff suppressed because it is too large Load Diff