From 5d9e3721ad196595acd064e0d3ce66edc2613e51 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 11 Jan 2023 13:39:59 +0100 Subject: New upstream version 1.40.10 --- .../dbus-org.freedesktop.NetworkManager.Device.xml | 5 +- docs/api/html/NetworkManager.devhelp2 | 99 +++++++++++----------- ...dbus-org.freedesktop.NetworkManager.Device.html | 6 +- docs/api/html/index.html | 2 +- docs/api/html/ix01.html | 16 ++-- docs/api/html/nm-dbus-types.html | 67 +++++++++++++-- docs/api/version.xml | 2 +- docs/libnm/html/NMDevice.html | 4 +- docs/libnm/html/NMVpnConnection.html | 8 +- docs/libnm/html/NMVpnPluginOld.html | 12 +-- docs/libnm/html/NMVpnServicePlugin.html | 6 +- docs/libnm/html/api-index-full.html | 12 ++- docs/libnm/html/index.html | 2 +- docs/libnm/html/libnm-nm-dbus-interface.html | 38 +++++++++ docs/libnm/html/libnm.devhelp2 | 3 + docs/libnm/html/object-tree.html | 8 +- docs/libnm/html/usage.html | 2 +- docs/libnm/libnm-sections.txt | 1 + docs/libnm/version.xml | 2 +- 19 files changed, 202 insertions(+), 93 deletions(-) (limited to 'docs') diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml index 0d73ca72..c8ccbd52 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml @@ -100,6 +100,9 @@ that the user made these changes intentionally outside of NetworkManager). Reapply can make the applied-connection different from the settings-connection, just like updating the settings-connection can make them different. + +Since 1.42, 1.40.10, "preserve-external-ip" flag (0x1) is supported to not +remove externally added IP addresses and routes on the device during reapply. @@ -117,7 +120,7 @@ If non-zero, the current version id of the applied-connection must match. The cu IN u flags: -Flags which would modify the behavior of the Reapply call. There are no flags defined currently and the users should use the value of 0. +Flags which would modify the behavior of the Reapply call. Invalid flags are rejected. diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index 257f6bde..52186b6b 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -508,6 +508,7 @@ + @@ -811,54 +812,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html index b1e492cb..f5026a1f 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html @@ -129,6 +129,10 @@ Reapply can make the applied-connection different from the settings-connection, just like updating the settings-connection can make them different.

+

+Since 1.42, 1.40.10, "preserve-external-ip" flag (0x1) is supported to not +remove externally added IP addresses and routes on the device during reapply. +

@@ -150,7 +154,7 @@ If non-zero, the current version id of the applied-connection must match. The cu diff --git a/docs/api/html/index.html b/docs/api/html/index.html index 6c1324c1..240e61e6 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -16,7 +16,7 @@

IN u flags:

-Flags which would modify the behavior of the Reapply call. There are no flags defined currently and the users should use the value of 0. +Flags which would modify the behavior of the Reapply call. Invalid flags are rejected.

- for NetworkManager 1.40.8 + for NetworkManager 1.40.10 The latest version of this documentation can be found on-line at https://networkmanager.dev/docs/api/latest/. diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index 15c9933b..d1897057 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -1123,9 +1123,9 @@

NMCheckpointCreateFlags, enum NMCheckpointCreateFlags
-
NMClientPermission, enum NMClientPermission +
NMClientPermission, enum NMClientPermission
-
NMClientPermissionResult, enum NMClientPermissionResult +
NMClientPermissionResult, enum NMClientPermissionResult
NMConnectionMultiConnect, enum NMConnectionMultiConnect
@@ -1133,10 +1133,12 @@
NMDeviceCapabilities, enum NMDeviceCapabilities
-
NMDeviceInterfaceFlags, enum NMDeviceInterfaceFlags +
NMDeviceInterfaceFlags, enum NMDeviceInterfaceFlags
NMDeviceModemCapabilities, enum NMDeviceModemCapabilities
+
NMDeviceReapplyFlags, enum NMDeviceReapplyFlags +
NMDeviceState, enum NMDeviceState
NMDeviceStateReason, enum NMDeviceStateReason @@ -1147,13 +1149,13 @@
NMIPTunnelMode, enum NMIPTunnelMode
-
NMManagerReloadFlags, enum NMManagerReloadFlags +
NMManagerReloadFlags, enum NMManagerReloadFlags
NMMetered, enum NMMetered
-
NMMptcpFlags, enum NMMptcpFlags +
NMMptcpFlags, enum NMMptcpFlags
-
NMRadioFlags, enum NMRadioFlags +
NMRadioFlags, enum NMRadioFlags
NMRollbackResult, enum NMRollbackResult
@@ -1169,7 +1171,7 @@
NMState, enum NMState
-
NMTernary, enum NMTernary +
NMTernary, enum NMTernary
NMVpnConnectionState, enum NMVpnConnectionState
diff --git a/docs/api/html/nm-dbus-types.html b/docs/api/html/nm-dbus-types.html index 0580b439..892a1924 100644 --- a/docs/api/html/nm-dbus-types.html +++ b/docs/api/html/nm-dbus-types.html @@ -3071,7 +3071,7 @@

enum NMMetered

-

The NMMetered enum has two different purposes: one is to configure "connection.metered" setting of a connection profile in NMSettingConnection, and the other is to express the actual metered state of the NMDevice at a given moment.

+

The NMMetered enum has two different purposes: one is to configure "connection.metered" setting of a connection profile in NMSettingConnection, and the other is to express the actual metered state of the NMDevice at a given moment.

For the connection profile only NM_METERED_UNKNOWN, NM_METERED_NO and NM_METERED_YES are allowed.

The device's metered state at runtime is determined by the profile which is currently active. If the profile explicitly specifies NM_METERED_NO or NM_METERED_YES, then the device's metered state is as such. If the connection profile leaves it undecided at NM_METERED_UNKNOWN (the default), then NetworkManager tries to guess the metered state, for example based on the device type or on DHCP options (like Android devices exposing a "ANDROID_METERED" DHCP vendor option). This then leads to either NM_METERED_GUESS_NO or NM_METERED_GUESS_YES.

Most applications probably should treat the runtime state NM_METERED_GUESS_YES like NM_METERED_YES, and all other states as not metered.

@@ -4619,12 +4619,63 @@
+

enum NMDeviceReapplyFlags

+

Flags for the Reapply() D-Bus call of a device and nm_device_reapply_async().

+

Since: 1.42, 1.40.10

+

On 1.40.10+, no GFlags type is created.

+

+
+

Values

+
++++++ + + + + + + + + + + + + + + +
+

NM_DEVICE_REAPPLY_FLAGS_NONE

+

+		 +

= 0

+

+		 +

no flag set.

+

+		 
+

NM_DEVICE_REAPPLY_FLAGS_PRESERVE_EXTERNAL_IP

+

+		 +

= 0x1

+

+		 +

during reapply, preserve external IP addresses and routes.

+

+		 
+
+
+
+

enum NMTernary

An boolean value that can be overridden by a default.

Since: 1.14

-

Values

+

Values

@@ -4689,7 +4740,7 @@

Since: 1.22

-

Values

+

Values

@@ -4784,7 +4835,7 @@

Since: 1.22

-

Values

+

Values

@@ -4893,7 +4944,7 @@

NMClientPermission values indicate various permissions that NetworkManager clients can obtain to perform certain tasks on behalf of the current user.

-

Values

+

Values

@@ -5182,7 +5233,7 @@

NMClientPermissionResult values indicate what authorizations and permissions the user requires to obtain a given NMClientPermission

-

Values

+

Values

@@ -5262,7 +5313,7 @@

Since: 1.38

-

Values

+

Values

@@ -5326,7 +5377,7 @@

Since: 1.40

-

Values

+

Values

diff --git a/docs/api/version.xml b/docs/api/version.xml index 19d25d0a..5faa4fff 100644 --- a/docs/api/version.xml +++ b/docs/api/version.xml @@ -1 +1 @@ -1.40.8 +1.40.10 diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html index ac125f88..6542dc63 100644 --- a/docs/libnm/html/NMDevice.html +++ b/docs/libnm/html/NMDevice.html @@ -2242,7 +2242,7 @@ nm_device_get_applied_connection ( - + @@ -2301,7 +2301,7 @@ nm_device_get_applied_connection_async - + diff --git a/docs/libnm/html/NMVpnConnection.html b/docs/libnm/html/NMVpnConnection.html index 6dfe6f8b..1aeca777 100644 --- a/docs/libnm/html/NMVpnConnection.html +++ b/docs/libnm/html/NMVpnConnection.html @@ -44,7 +44,7 @@ - + @@ -136,7 +136,7 @@

Functions

nm_vpn_connection_get_vpn_state ()

-
NMVpnConnectionState
+
NMVpnConnectionState
 nm_vpn_connection_get_vpn_state (NMVpnConnection *vpn);

 
Gets the current NMVpnConnection state.

 

@@ -219,7 +219,7 @@ string used by the connection, and must not be modified.

 

 

 
The “vpn-state” property

-
  “vpn-state”                NMVpnConnectionState

+
  “vpn-state”                NMVpnConnectionState

 
The VPN state of the active VPN connection.

 
Owner: NMVpnConnection

 
Flags: Read

diff --git a/docs/libnm/html/NMVpnPluginOld.html b/docs/libnm/html/NMVpnPluginOld.html
index ed72c07f..276d337b 100644
--- a/docs/libnm/html/NMVpnPluginOld.html
+++ b/docs/libnm/html/NMVpnPluginOld.html
@@ -53,7 +53,7 @@
- + @@ -258,7 +258,7 @@ nm_vpn_plugin_old_get_connection (

nm_vpn_plugin_old_get_state ()

-
NMVpnServiceState
+
NMVpnServiceState
 nm_vpn_plugin_old_get_state (NMVpnPluginOld *plugin);

 

 
nm_vpn_plugin_old_get_state has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -270,7 +270,7 @@ nm_vpn_plugin_old_get_state (
nm_vpn_plugin_old_set_state ()

 
void
 nm_vpn_plugin_old_set_state (NMVpnPluginOld *plugin,
-                             NMVpnServiceState state);

+                             NMVpnServiceState state);

nm_vpn_plugin_old_set_state has been deprecated since version 1.2 and should not be used in newly-written code.

Replaced by NMVpnServicePlugin.

@@ -336,7 +336,7 @@ nm_vpn_plugin_old_set_login_banner (

nm_vpn_plugin_old_failure ()

void
 nm_vpn_plugin_old_failure (NMVpnPluginOld *plugin,
-                           NMVpnPluginFailure reason);
+ NMVpnPluginFailure reason);

nm_vpn_plugin_old_failure has been deprecated since version 1.2 and should not be used in newly-written code.

Replaced by NMVpnServicePlugin.

@@ -497,7 +497,7 @@ to flags,

The “state” property

-
  “state”                    NMVpnServiceState
+
  “state”                    NMVpnServiceState

The state of the plugin.

NMVpnPluginOld:state has been deprecated since version 1.2 and should not be used in newly-written code.

diff --git a/docs/libnm/html/NMVpnServicePlugin.html b/docs/libnm/html/NMVpnServicePlugin.html index e53bfaa2..6349d207 100644 --- a/docs/libnm/html/NMVpnServicePlugin.html +++ b/docs/libnm/html/NMVpnServicePlugin.html @@ -150,7 +150,7 @@
- + @@ -325,7 +325,7 @@ nm_vpn_service_plugin_set_login_banner

nm_vpn_service_plugin_failure ()

void
 nm_vpn_service_plugin_failure (NMVpnServicePlugin *plugin,
-                               NMVpnPluginFailure reason);
+ NMVpnPluginFailure reason);

Since: 1.2

@@ -522,7 +522,7 @@ to flags,

The “state” property

-
  “state”                    NMVpnServiceState
+
  “state”                    NMVpnServiceState

The state of the plugin.

Owner: NMVpnServicePlugin

Flags: Read / Write

diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html index a07306d0..a56e05db 100644 --- a/docs/libnm/html/api-index-full.html +++ b/docs/libnm/html/api-index-full.html @@ -913,6 +913,10 @@ NMDeviceEthernetClass, struct in NMDeviceReapplyFlags, enum in nm-dbus-interface + +
+
NMDeviceState, enum in nm-dbus-interface
@@ -3765,11 +3769,11 @@ NMUtilsPredicateStr, user_function in NMSettingOvs
-NMVpnConnectionState, enum in nm-vpn-dbus-interface +NMVpnConnectionState, enum in nm-vpn-dbus-interface
-NMVpnConnectionStateReason, enum in nm-vpn-dbus-interface +NMVpnConnectionStateReason, enum in nm-vpn-dbus-interface
@@ -3821,7 +3825,7 @@ NMVpnConnectionStateReason, enum in nm-vpn-dbus-interface
-NMVpnPluginFailure, enum in nm-vpn-dbus-interface +NMVpnPluginFailure, enum in nm-vpn-dbus-interface
@@ -3933,7 +3937,7 @@ NMVpnPluginFailure, enum in nm-vpn-dbus-interface
-NMVpnServiceState, enum in nm-vpn-dbus-interface +NMVpnServiceState, enum in nm-vpn-dbus-interface
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html index 9b382b70..6ed937a6 100644 --- a/docs/libnm/html/index.html +++ b/docs/libnm/html/index.html @@ -15,7 +15,7 @@

flags

the flags argument. Currently, this value must always be zero.

the flags argument. See NMDeviceReapplyFlags.

  

flags

the flags argument. Currently, this value must always be zero.

the flags argument. See NMDeviceReapplyFlags.

  
-NMVpnConnectionState +NMVpnConnectionState nm_vpn_connection_get_vpn_state () @@ -76,7 +76,7 @@ Read
NMVpnConnectionStateNMVpnConnectionState vpn-state Read
-NMVpnServiceState +NMVpnServiceState nm_vpn_plugin_old_get_state () @@ -142,7 +142,7 @@ Read / Write / Construct Only
NMVpnServiceStateNMVpnServiceState state Read / Write
Read / Write / Construct Only
NMVpnServiceStateNMVpnServiceState state Read / Write

- for libnm 1.40.8 + for libnm 1.40.10 The latest version of this documentation can be found on-line at https://networkmanager.dev/docs/libnm/latest/. diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html index 4db42937..a91a828e 100644 --- a/docs/libnm/html/libnm-nm-dbus-interface.html +++ b/docs/libnm/html/libnm-nm-dbus-interface.html @@ -490,6 +490,10 @@ enum +NMDeviceReapplyFlags + + +enum NMTernary @@ -3671,6 +3675,40 @@ the profile. Since: 1.20.

+

enum NMDeviceReapplyFlags

+

Flags for the Reapply() D-Bus call of a device and +nm_device_reapply_async().

+
+

Members

+
+++++ + + + + + + + + + + + + +

NM_DEVICE_REAPPLY_FLAGS_NONE

 +

no flag set.

+		 

NM_DEVICE_REAPPLY_FLAGS_PRESERVE_EXTERNAL_IP

 +

during reapply, +preserve external IP addresses and routes.

+		 
+
+

Since: 1.42, 1.40.10

+
+
+

enum NMTernary

An boolean value that can be overridden by a default.

diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2 index c3b8145c..308e60cd 100644 --- a/docs/libnm/html/libnm.devhelp2 +++ b/docs/libnm/html/libnm.devhelp2 @@ -494,6 +494,7 @@ + @@ -3485,6 +3486,8 @@ + + diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html index 04306fd0..ebc3205c 100644 --- a/docs/libnm/html/object-tree.html +++ b/docs/libnm/html/object-tree.html @@ -214,10 +214,10 @@ ├── NMTernary ├── NMUtilsSecurityType ├── NMVlanPriorityMap - ├── NMVpnConnectionState - ├── NMVpnConnectionStateReason - ├── NMVpnPluginFailure - ├── NMVpnServiceState + ├── NMVpnConnectionState + ├── NMVpnConnectionStateReason + ├── NMVpnPluginFailure + ├── NMVpnServiceState ├── NMWepKeyType ╰── NMWimaxNspNetworkType GBoxed diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html index 3857f15a..e5334abc 100644 --- a/docs/libnm/html/usage.html +++ b/docs/libnm/html/usage.html @@ -96,7 +96,7 @@ 

$ cc $(pkg-config --libs --cflags libnm) -o hello-nm hello-nm.c
   $ ./hello-nm
-  NetworkManager version: 1.40.8
+  NetworkManager version: 1.40.10
 
   $

diff --git a/docs/libnm/libnm-sections.txt b/docs/libnm/libnm-sections.txt index e497c044..8bfa213b 100644 --- a/docs/libnm/libnm-sections.txt +++ b/docs/libnm/libnm-sections.txt @@ -722,6 +722,7 @@ NMSettingsConnectionFlags NMActivationStateFlags NMSettingsAddConnection2Flags NMSettingsUpdate2Flags +NMDeviceReapplyFlags NMTernary NMManagerReloadFlags NMDeviceInterfaceFlags diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml index 19d25d0a..5faa4fff 100644 --- a/docs/libnm/version.xml +++ b/docs/libnm/version.xml @@ -1 +1 @@ -1.40.8 +1.40.10 -- cgit 1.3.0-6-gf8a5