From e96d74409128c6a977e31f24fad9b267d2feb9a1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 9 Aug 2024 18:57:15 +0200 Subject: New upstream version 1.48.8 --- docs/libnm/html/NMActiveConnection.html | 6 +++--- docs/libnm/html/NMDevice.html | 2 +- docs/libnm/html/NMDeviceBond.html | 4 ++-- docs/libnm/html/NMDeviceBridge.html | 6 +++--- docs/libnm/html/NMDeviceOvsBridge.html | 6 +++--- docs/libnm/html/NMDeviceOvsPort.html | 6 +++--- docs/libnm/html/NMDeviceTeam.html | 6 +++--- docs/libnm/html/NMSettingConnection.html | 16 +++++++-------- docs/libnm/html/NMSettingTeam.html | 4 ++-- docs/libnm/html/api-index-full.html | 4 ++++ docs/libnm/html/index.html | 2 +- docs/libnm/html/libnm-nm-dbus-interface.html | 30 ++++++++++++++++++---------- docs/libnm/html/libnm-nm-utils.html | 6 +++--- docs/libnm/html/libnm-nm-version-macros.html | 2 +- docs/libnm/html/libnm.devhelp2 | 7 ++++--- docs/libnm/html/usage.html | 2 +- 16 files changed, 62 insertions(+), 47 deletions(-) (limited to 'docs/libnm/html') diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html index 2c9c5215..4e49ea67 100644 --- a/docs/libnm/html/NMActiveConnection.html +++ b/docs/libnm/html/NMActiveConnection.html @@ -663,7 +663,7 @@ nm_active_connection_get_master (nm_active_connection_get_master has been deprecated since version 1.44 and should not be used in newly-written code.

Use nm_active_connection_get_controller() instead.

-

Gets the master NMDevice of the connection.

+

Gets the controller NMDevice of the connection.

Parameters

@@ -681,7 +681,7 @@ nm_active_connection_get_master (

Returns

-

the master NMDevice of the NMActiveConnection.

+

the controller NMDevice of the NMActiveConnection.

[transfer none]

@@ -1111,7 +1111,7 @@ nm_active_connection_get_vpn (

The “master” property

  “master”                   NMDevice *
-

The master device if one exists. Replaced by the "controller" property.

+

The controller device if one exists. Replaced by the "controller" property.

NMActiveConnection:master has been deprecated since version 1.44 and should not be used in newly-written code.

Owner: NMActiveConnection

Flags: Read

diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html index c7cbf68c..7d8b88a5 100644 --- a/docs/libnm/html/NMDevice.html +++ b/docs/libnm/html/NMDevice.html @@ -1283,7 +1283,7 @@ nm_device_get_ports (

Returns

the GPtrArray containing NMDevices that -are slaves of device +are ports of device . This is the internal copy used by the device and must not be modified.

[element-type NMDevice]

diff --git a/docs/libnm/html/NMDeviceBond.html b/docs/libnm/html/NMDeviceBond.html index 50f4fbfa..3b6e1faa 100644 --- a/docs/libnm/html/NMDeviceBond.html +++ b/docs/libnm/html/NMDeviceBond.html @@ -195,7 +195,7 @@ nm_device_bond_get_slaves (nm_device_bond_get_slaves has been deprecated since version 1.34 and should not be used in newly-written code.

Use nm_device_get_ports() instead.

-

Gets the devices currently enslaved to device +

Gets the devices currently attached as port to device .

Parameters

@@ -261,7 +261,7 @@ copy used by the device, and must not be modified.

The “slaves” property

  “slaves”                   GPtrArray *
-

The devices enslaved to the bond device.

+

The devices attached as port to the bond device.

[type GPtrArray(NMDevice)]

Owner: NMDeviceBond

Flags: Read

diff --git a/docs/libnm/html/NMDeviceBridge.html b/docs/libnm/html/NMDeviceBridge.html index 83ea42bc..f0be9f43 100644 --- a/docs/libnm/html/NMDeviceBridge.html +++ b/docs/libnm/html/NMDeviceBridge.html @@ -195,7 +195,7 @@ nm_device_bridge_get_slaves (nm_device_bridge_get_slaves has been deprecated since version 1.34 and should not be used in newly-written code.

Use nm_device_get_ports() instead.

-

Gets the devices currently enslaved to device +

Gets the devices currently attached as port to device .

Parameters

@@ -215,7 +215,7 @@ nm_device_bridge_get_slaves (

Returns

the GPtrArray containing -NMDevices that are slaves of device +NMDevices that are ports of device . This is the internal copy used by the device, and must not be modified.

[element-type NMDevice]

@@ -261,7 +261,7 @@ copy used by the device, and must not be modified.

The “slaves” property

  “slaves”                   GPtrArray *
-

The devices enslaved to the bridge device.

+

The devices attached as port to the bridge device.

[type GPtrArray(NMDevice)]

Owner: NMDeviceBridge

Flags: Read

diff --git a/docs/libnm/html/NMDeviceOvsBridge.html b/docs/libnm/html/NMDeviceOvsBridge.html index cf296576..80f54539 100644 --- a/docs/libnm/html/NMDeviceOvsBridge.html +++ b/docs/libnm/html/NMDeviceOvsBridge.html @@ -105,7 +105,7 @@ nm_device_ovs_bridge_get_slaves (nm_device_ovs_bridge_get_slaves has been deprecated since version 1.34 and should not be used in newly-written code.

Use nm_device_get_ports() instead.

-

Gets the ports currently enslaved to device +

Gets the ports currently attached as port to device .

Parameters

@@ -125,7 +125,7 @@ nm_device_ovs_bridge_get_slaves (

Returns

the GPtrArray containing -NMDevices that are slaves of device +NMDevices that are ports of device . This is the internal copy used by the device, and must not be modified.

[element-type NMDevice]

@@ -152,7 +152,7 @@ copy used by the device, and must not be modified.

The “slaves” property

  “slaves”                   GPtrArray *
-

Gets the ports currently enslaved to the device.

+

Gets the ports currently attached as port to the device.

[type GPtrArray(NMDevice)]

Owner: NMDeviceOvsBridge

Flags: Read

diff --git a/docs/libnm/html/NMDeviceOvsPort.html b/docs/libnm/html/NMDeviceOvsPort.html index dcd25db2..e664afb7 100644 --- a/docs/libnm/html/NMDeviceOvsPort.html +++ b/docs/libnm/html/NMDeviceOvsPort.html @@ -105,7 +105,7 @@ nm_device_ovs_port_get_slaves (nm_device_ovs_port_get_slaves has been deprecated since version 1.34 and should not be used in newly-written code.

Use nm_device_get_ports() instead.

-

Gets the interfaces currently enslaved to device +

Gets the interfaces currently attached as port to device .

Parameters

@@ -125,7 +125,7 @@ nm_device_ovs_port_get_slaves (

Returns

the GPtrArray containing -NMDevices that are slaves of device +NMDevices that are ports of device . This is the internal copy used by the device, and must not be modified.

[element-type NMDevice]

@@ -152,7 +152,7 @@ copy used by the device, and must not be modified.

The “slaves” property

  “slaves”                   GPtrArray *
-

Gets the interfaces currently enslaved to the device.

+

Gets the interfaces currently attached as port to the device.

[type GPtrArray(NMDevice)]

Owner: NMDeviceOvsPort

Flags: Read

diff --git a/docs/libnm/html/NMDeviceTeam.html b/docs/libnm/html/NMDeviceTeam.html index 84bae898..593166dc 100644 --- a/docs/libnm/html/NMDeviceTeam.html +++ b/docs/libnm/html/NMDeviceTeam.html @@ -212,7 +212,7 @@ nm_device_team_get_slaves (nm_device_team_get_slaves has been deprecated since version 1.34 and should not be used in newly-written code.

Use nm_device_get_ports() instead.

-

Gets the devices currently enslaved to device +

Gets the devices currently attach as port to device .

Parameters

@@ -232,7 +232,7 @@ nm_device_team_get_slaves (

Returns

the GPtrArray containing -NMDevices that are slaves of device +NMDevices that are ports of device . This is the internal copy used by the device, and must not be modified.

[element-type NMDevice]

@@ -322,7 +322,7 @@ device, and must not be modified.

The “slaves” property

  “slaves”                   GPtrArray *
-

The devices enslaved to the team device.

+

The devices attached as port to the team device.

[type GPtrArray(NMDevice)]

Owner: NMDeviceTeam

Flags: Read

diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html index 2620fe0f..8d79934b 100644 --- a/docs/libnm/html/NMSettingConnection.html +++ b/docs/libnm/html/NMSettingConnection.html @@ -1197,7 +1197,7 @@ is just an alias.

Returns

-

interface name of the master device or UUID of the master +

interface name of the controller device or UUID of the controller connection.

@@ -1254,7 +1254,7 @@ nm_setting_connection_is_slave_type (

type

 +'s port type

 @@ -1262,7 +1262,7 @@ against setting

Returns

-

TRUE if connection is of the given slave type +

TRUE if connection is of the given port type

@@ -1294,7 +1294,7 @@ is just an alias.

Returns

-

the type of slave this connection is, if any

+

the type of port this connection is, if any

@@ -1353,7 +1353,7 @@ is just an alias.

Returns

-

whether slaves of the connection should be activated together +

whether ports of the connection should be activated together with the connection.

Since: 1.2

@@ -2101,7 +2101,7 @@ property.

enum NMSettingConnectionAutoconnectSlaves

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

NMSettingConnectionAutoconnectSlaves values indicate whether slave connections -should be activated when master is activated.

+should be activated when controller is activated.

Members

the setting name (ie NM_SETTING_BOND_SETTING_NAME) to be matched against setting -'s slave type

 
@@ -2122,7 +2122,7 @@ should be activated when master is activated.

 @@ -2130,7 +2130,7 @@ master is activated

 diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html index eaa62d32..82d73897 100644 --- a/docs/libnm/html/NMSettingTeam.html +++ b/docs/libnm/html/NMSettingTeam.html @@ -1011,7 +1011,7 @@ going down and the runner being notified about it.

nm_team_link_watcher_get_init_wait ()

int
 nm_team_link_watcher_get_init_wait (const NMTeamLinkWatcher *watcher);
-

Gets the init_wait interval (in milliseconds) that the team slave should +

Gets the init_wait interval (in milliseconds) that the team port should wait before sending the first packet to the target host.

Parameters

@@ -1035,7 +1035,7 @@ wait before sending the first packet to the target host.

nm_team_link_watcher_get_interval ()

int
 nm_team_link_watcher_get_interval (const NMTeamLinkWatcher *watcher);
-

Gets the interval (in milliseconds) that the team slave should wait between +

Gets the interval (in milliseconds) that the team port should wait between sending two check packets to the target host.

Parameters

diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html index dd29e8a6..39fa0e7b 100644 --- a/docs/libnm/html/api-index-full.html +++ b/docs/libnm/html/api-index-full.html @@ -225,6 +225,10 @@
+NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES, macro in nm-dbus-interface +
+
+
NMActiveConnection, struct in NMActiveConnection
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html index ad68de63..db1ea997 100644 --- a/docs/libnm/html/index.html +++ b/docs/libnm/html/index.html @@ -15,7 +15,7 @@

NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO

slaves are not brought up when -master is activated

+controller is activated

  

NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES

slaves are brought up when -master is activated

+controller is activated

  

- for libnm 1.48.6 + for libnm 1.48.8 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 0e1ca808..0a3867ad 100644 --- a/docs/libnm/html/libnm-nm-dbus-interface.html +++ b/docs/libnm/html/libnm-nm-dbus-interface.html @@ -493,6 +493,10 @@ NMActivationStateFlags +#define +NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES + + enum NMSettingsAddConnection2Flags @@ -1270,7 +1274,7 @@ GSM/UMTS, or LTE network access protocols

NM_DEVICE_TYPE_BOND

-

a bond master interface

+

a bond controller interface

  @@ -1291,7 +1295,7 @@ GSM/UMTS, or LTE network access protocols

NM_DEVICE_TYPE_BRIDGE

-

a bridge master interface

+

a bridge controller interface

  @@ -1305,7 +1309,7 @@ GSM/UMTS, or LTE network access protocols

NM_DEVICE_TYPE_TEAM

-

a team master interface

+

a team controller interface

  @@ -3622,16 +3626,16 @@ an external configuration of a networking device. Since: 1.26.

  -

NM_ACTIVATION_STATE_FLAG_IS_MASTER

+

NM_ACTIVATION_STATE_FLAG_IS_CONTROLLER

-

the device is a master.

+

the device is a controller.

  -

NM_ACTIVATION_STATE_FLAG_IS_SLAVE

+

NM_ACTIVATION_STATE_FLAG_IS_PORT

-

the device is a slave.

+

the device is a port.

  @@ -3657,10 +3661,10 @@ an external configuration of a networking device. Since: 1.26.

  -

NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES

+

NM_ACTIVATION_STATE_FLAG_CONTROLLER_HAS_PORTS

-

The master has any slave devices attached. -This only makes sense if the device is a master.

+

The controller has any port devices attached. +This only makes sense if the device is a controller.

  @@ -3689,6 +3693,12 @@ represent an external configuration of a networking device. Since: 1.26.

+

NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES

+
#define NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES NM_ACTIVATION_FLAG_CONTROLLER_HAS_PORTS
+
+
+
+

enum NMSettingsAddConnection2Flags

Numeric flags for the "flags" argument of AddConnection2() D-Bus API.

diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html index bf01858f..f14b001d 100644 --- a/docs/libnm/html/libnm-nm-utils.html +++ b/docs/libnm/html/libnm-nm-utils.html @@ -2706,10 +2706,10 @@ general case) work with connections of type other_ty other_type is a valid type for the parent of a VLAN.

If virtual_type - is a "master" type (eg, NM_TYPE_SETTING_BRIDGE), + is a "controller" type (eg, NM_TYPE_SETTING_BRIDGE), then this checks if other_type - is a valid type for a slave of that -master.

+ is a valid type for a port of that +controller.

Note that even if this returns TRUE it is not guaranteed that every connection of type other_type is diff --git a/docs/libnm/html/libnm-nm-version-macros.html b/docs/libnm/html/libnm-nm-version-macros.html index aa3f6e90..4ea9a41e 100644 --- a/docs/libnm/html/libnm-nm-version-macros.html +++ b/docs/libnm/html/libnm-nm-version-macros.html @@ -269,7 +269,7 @@ is compiled against.

NM_MICRO_VERSION

-
#define NM_MICRO_VERSION (6)
+
#define NM_MICRO_VERSION (8)
 

 
Evaluates to the micro version number of NetworkManager which this source
 compiled against.

diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2
index 71a1a7e9..070c0df1 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -510,6 +510,7 @@
     
     
     
+    
     
     
     
@@ -3867,12 +3868,12 @@
     
     
     
-    
-    
+    
+    
     
     
     
-    
+    
     
     
     
diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html
index 2f493595..47743c6e 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.48.6
+  NetworkManager version: 1.48.8
 
   $ 

 

-- 
cgit 1.3.0-6-gf8a5